From ecb272c3db8d817897acfb98983510231135608c Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Tue, 25 Aug 2026 09:53:07 +0200 Subject: [PATCH 1/2] global: remove unused SHARED_DATA SHARED_DATA is only non-empty on non-Zephyr and non-unit-test builds of cAVS. At most that includes pure build tests or testbench, of which none need it either. Remove it globally. Signed-off-by: Guennadi Liakhovetski --- src/audio/base_fw.c | 4 +- src/audio/chain_dma.c | 2 +- src/audio/component.c | 4 +- src/audio/dai-legacy.c | 4 +- src/audio/dai-zephyr.c | 4 +- src/audio/google/google_hotword_detect.c | 4 +- src/audio/host-legacy.c | 4 +- src/audio/host-zephyr.c | 4 +- src/audio/kpb.c | 4 +- src/audio/pipeline/pipeline-graph.c | 5 +- src/audio/selector/selector.c | 4 +- src/audio/tone/tone-ipc3.c | 4 +- src/audio/tone/tone-ipc4.c | 2 +- src/audio/tone/tone.c | 2 +- src/audio/tone/tone.h | 2 +- src/drivers/interrupt.c | 2 +- src/idc/idc.c | 2 +- .../sof/audio/module_adapter/module/generic.h | 2 +- src/lib/clk.c | 2 +- src/lib/notifier.c | 2 +- .../amd/acp_6_3/include/platform/lib/memory.h | 1 - src/platform/amd/acp_6_3/lib/clk.c | 2 +- src/platform/amd/acp_6_3/lib/dma.c | 2 +- src/platform/amd/acp_6_3/lib/memory.c | 32 ++++++------ src/platform/amd/acp_6_3/platform.c | 2 +- .../amd/acp_7_0/include/platform/lib/memory.h | 1 - src/platform/amd/acp_7_0/lib/clk.c | 2 +- src/platform/amd/acp_7_0/lib/dma.c | 2 +- src/platform/amd/acp_7_0/lib/memory.c | 32 ++++++------ .../amd/acp_7_x/include/platform/lib/memory.h | 1 - src/platform/amd/acp_7_x/lib/clk.c | 2 +- .../rembrandt/include/platform/lib/memory.h | 2 - src/platform/amd/rembrandt/lib/clk.c | 2 +- src/platform/amd/rembrandt/lib/dma.c | 2 +- .../amd/renoir/include/platform/lib/memory.h | 2 - src/platform/amd/renoir/lib/clk.c | 2 +- src/platform/amd/renoir/lib/dma.c | 2 +- src/platform/amd/renoir/lib/memory.c | 32 ++++++------ src/platform/amd/renoir/platform.c | 2 +- .../amd/vangogh/include/platform/lib/memory.h | 2 - src/platform/amd/vangogh/lib/clk.c | 2 +- src/platform/amd/vangogh/lib/dma.c | 2 +- src/platform/amd/vangogh/lib/memory.c | 32 ++++++------ src/platform/amd/vangogh/platform.c | 2 +- .../imx8/include/platform/lib/memory.h | 11 +--- src/platform/imx8/lib/clk.c | 2 +- src/platform/imx8/lib/dai.c | 4 +- src/platform/imx8/lib/dma.c | 2 +- src/platform/imx8/lib/memory.c | 32 ++++++------ .../imx8m/include/platform/lib/memory.h | 11 +--- src/platform/imx8m/lib/clk.c | 2 +- src/platform/imx8m/lib/dai.c | 4 +- src/platform/imx8m/lib/dma.c | 2 +- src/platform/imx8m/lib/memory.c | 34 ++++++------ .../imx8m_cm7/include/platform/lib/memory.h | 2 - .../imx8ulp/include/platform/lib/memory.h | 11 +--- src/platform/imx8ulp/lib/clk.c | 2 +- src/platform/imx8ulp/lib/dai.c | 2 +- src/platform/imx8ulp/lib/dma.c | 2 +- src/platform/imx8ulp/lib/memory.c | 32 ++++++------ .../imx93_a55/include/platform/lib/memory.h | 2 - .../imx95/include/platform/lib/memory.h | 2 - .../intel/ace/include/ace/lib/memory.h | 8 --- .../intel/cavs/include/cavs/lib/memory.h | 12 ----- .../library/include/platform/lib/memory.h | 2 - src/platform/library/lib/memory.c | 52 +++++++++---------- src/platform/library/platform.c | 2 +- .../mt8186/include/platform/lib/memory.h | 11 +--- src/platform/mt8186/lib/clk.c | 2 +- src/platform/mt8186/lib/dai.c | 2 +- src/platform/mt8186/lib/dma.c | 2 +- src/platform/mt8186/lib/memory.c | 34 ++++++------ src/platform/mt8186/platform.c | 2 +- .../mt8188/include/platform/lib/memory.h | 13 ++--- src/platform/mt8188/lib/clk.c | 2 +- src/platform/mt8188/lib/dai.c | 2 +- src/platform/mt8188/lib/dma.c | 2 +- src/platform/mt8188/lib/memory.c | 34 ++++++------ src/platform/mt8188/platform.c | 2 +- .../mt8195/include/platform/lib/memory.h | 11 +--- src/platform/mt8195/lib/clk.c | 2 +- src/platform/mt8195/lib/dai.c | 2 +- src/platform/mt8195/lib/dma.c | 2 +- src/platform/mt8195/lib/memory.c | 34 ++++++------ src/platform/mt8195/platform.c | 2 +- .../mt8196/include/platform/lib/memory.h | 13 ++--- src/platform/mt8196/lib/clk.c | 2 +- src/platform/mt8196/lib/dai.c | 2 +- src/platform/mt8196/lib/dma.c | 2 +- src/platform/mt8196/lib/memory.c | 34 ++++++------ src/platform/mt8196/platform.c | 2 +- .../mt8365/include/platform/lib/memory.h | 11 +--- src/platform/mt8365/lib/clk.c | 2 +- src/platform/mt8365/lib/dai.c | 2 +- src/platform/mt8365/lib/dma.c | 2 +- src/platform/mt8365/lib/memory.c | 34 ++++++------ src/platform/mt8365/platform.c | 2 +- .../mtk/include/platform/lib/memory.h | 2 - .../posix/include/platform/lib/memory.h | 2 - .../qemu_xtensa/include/platform/lib/memory.h | 1 - src/samples/audio/detect_test.c | 2 +- src/samples/audio/smart_amp_test_ipc3.c | 2 +- zephyr/lib/clk.c | 2 +- zephyr/lib/dma.c | 2 +- 104 files changed, 323 insertions(+), 422 deletions(-) diff --git a/src/audio/base_fw.c b/src/audio/base_fw.c index 2602add04cdc..88d3a54adcee 100644 --- a/src/audio/base_fw.c +++ b/src/audio/base_fw.c @@ -4,7 +4,7 @@ // #include -#include /* for SHARED_DATA */ +#include /* likely unneeded */ #include #include #include @@ -857,7 +857,7 @@ static const struct comp_driver comp_basefw = { }, }; -static SHARED_DATA struct comp_driver_info comp_basefw_info = { +static struct comp_driver_info comp_basefw_info = { .drv = &comp_basefw, }; diff --git a/src/audio/chain_dma.c b/src/audio/chain_dma.c index 34106c57cc83..1260cf44a21c 100644 --- a/src/audio/chain_dma.c +++ b/src/audio/chain_dma.c @@ -795,7 +795,7 @@ static const struct comp_driver comp_chain_dma = { }, }; -static SHARED_DATA struct comp_driver_info comp_chain_dma_info = { +static struct comp_driver_info comp_chain_dma_info = { .drv = &comp_chain_dma, }; diff --git a/src/audio/component.c b/src/audio/component.c index 3c7021057259..e2c38a9c62da 100644 --- a/src/audio/component.c +++ b/src/audio/component.c @@ -13,7 +13,7 @@ #include #include #include -#include /* for SHARED_DATA */ +#include /* likely unneeded */ #include #include #include @@ -36,7 +36,7 @@ LOG_MODULE_REGISTER(component, CONFIG_SOF_LOG_LEVEL); -static APP_SYSUSER_BSS SHARED_DATA struct comp_driver_list cd; +static APP_SYSUSER_BSS struct comp_driver_list cd; #ifdef CONFIG_SOF_USERSPACE_LL struct comp_driver_list *comp_drivers_get(void) diff --git a/src/audio/dai-legacy.c b/src/audio/dai-legacy.c index 8a9496c49121..d16aec40efd8 100644 --- a/src/audio/dai-legacy.c +++ b/src/audio/dai-legacy.c @@ -19,7 +19,7 @@ #include #include #include -#include /* for SHARED_DATA */ +#include /* likely unneeded */ #include #include #include @@ -1128,7 +1128,7 @@ static const struct comp_driver comp_dai = { }, }; -static SHARED_DATA struct comp_driver_info comp_dai_info = { +static struct comp_driver_info comp_dai_info = { .drv = &comp_dai, }; diff --git a/src/audio/dai-zephyr.c b/src/audio/dai-zephyr.c index 1dbd4f5e133d..7bb53c88e178 100644 --- a/src/audio/dai-zephyr.c +++ b/src/audio/dai-zephyr.c @@ -19,7 +19,7 @@ #include #include #include -#include /* for SHARED_DATA */ +#include /* likely unneeded */ #include #include #include @@ -2092,7 +2092,7 @@ static const struct comp_driver comp_dai = { }, }; -static SHARED_DATA struct comp_driver_info comp_dai_info = { +static struct comp_driver_info comp_dai_info = { .drv = &comp_dai, }; diff --git a/src/audio/google/google_hotword_detect.c b/src/audio/google/google_hotword_detect.c index 1055f7914e1e..f8f7c22467be 100644 --- a/src/audio/google/google_hotword_detect.c +++ b/src/audio/google/google_hotword_detect.c @@ -15,7 +15,7 @@ #include #include #include -#include /* for SHARED_DATA */ +#include /* likely unneeded */ #include #include #include @@ -466,7 +466,7 @@ static const struct comp_driver ghd_driver = { }, }; -static SHARED_DATA struct comp_driver_info ghd_driver_info = { +static struct comp_driver_info ghd_driver_info = { .drv = &ghd_driver, }; diff --git a/src/audio/host-legacy.c b/src/audio/host-legacy.c index 4560959bb044..d56319c0184d 100644 --- a/src/audio/host-legacy.c +++ b/src/audio/host-legacy.c @@ -17,7 +17,7 @@ #include #include #include -#include /* for SHARED_DATA */ +#include /* likely unneeded */ #include #include #include @@ -1068,7 +1068,7 @@ static const struct comp_driver comp_host = { }, }; -static SHARED_DATA struct comp_driver_info comp_host_info = { +static struct comp_driver_info comp_host_info = { .drv = &comp_host, }; diff --git a/src/audio/host-zephyr.c b/src/audio/host-zephyr.c index 95f8f35a3736..f2bfae946d8d 100644 --- a/src/audio/host-zephyr.c +++ b/src/audio/host-zephyr.c @@ -17,7 +17,7 @@ #include #include #include -#include /* for SHARED_DATA */ +#include /* likely unneeded */ #include #include #include @@ -1332,7 +1332,7 @@ static const struct comp_driver comp_host = { }, }; -static SHARED_DATA struct comp_driver_info comp_host_info = { +static struct comp_driver_info comp_host_info = { .drv = &comp_host, }; diff --git a/src/audio/kpb.c b/src/audio/kpb.c index d5434f5e6a87..40353ff71e20 100644 --- a/src/audio/kpb.c +++ b/src/audio/kpb.c @@ -26,7 +26,7 @@ #include #include #include -#include /* for SHARED_DATA */ +#include /* likely unneeded */ #include #include #include @@ -2742,7 +2742,7 @@ static const struct comp_driver comp_kpb = { }, }; -static SHARED_DATA struct comp_driver_info comp_kpb_info = { +static struct comp_driver_info comp_kpb_info = { .drv = &comp_kpb, }; diff --git a/src/audio/pipeline/pipeline-graph.c b/src/audio/pipeline/pipeline-graph.c index 6b566f207afa..670df08e9383 100644 --- a/src/audio/pipeline/pipeline-graph.c +++ b/src/audio/pipeline/pipeline-graph.c @@ -50,12 +50,11 @@ struct pipeline_posn { #endif }; /* the pipeline position lookup table */ -static APP_SYSUSER_BSS SHARED_DATA struct pipeline_posn pipeline_posn_shared; +static APP_SYSUSER_BSS struct pipeline_posn pipeline_posn_shared; #ifdef CONFIG_SOF_USERSPACE_LL /* Mutex pointer in user-accessible partition so user-space threads - * can read the pointer for syscalls. Kept outside the SHARED_DATA - * struct to avoid kernel object tracking issues. + * can read the pointer for syscalls. */ static APP_SYSUSER_BSS struct k_mutex *pipeline_posn_mutex; #endif diff --git a/src/audio/selector/selector.c b/src/audio/selector/selector.c index df814b6c24f6..422e08f69603 100644 --- a/src/audio/selector/selector.c +++ b/src/audio/selector/selector.c @@ -22,7 +22,7 @@ #include #include #include -#include /* for SHARED_DATA */ +#include /* likely unneeded */ #include #include #include @@ -609,7 +609,7 @@ static const struct comp_driver comp_selector = { }, }; -static SHARED_DATA struct comp_driver_info comp_selector_info = { +static struct comp_driver_info comp_selector_info = { .drv = &comp_selector, }; diff --git a/src/audio/tone/tone-ipc3.c b/src/audio/tone/tone-ipc3.c index db36b9a88cbe..b2ebb3209571 100644 --- a/src/audio/tone/tone-ipc3.c +++ b/src/audio/tone/tone-ipc3.c @@ -16,7 +16,7 @@ #include #include #include -#include /* for SHARED_DATA */ +#include /* likely unneeded */ #include #include #include @@ -395,7 +395,7 @@ static const struct comp_driver comp_tone = { }, }; -static SHARED_DATA struct comp_driver_info comp_tone_info = { +static struct comp_driver_info comp_tone_info = { .drv = &comp_tone, }; diff --git a/src/audio/tone/tone-ipc4.c b/src/audio/tone/tone-ipc4.c index eaa2bffcdb48..db2497e8aa40 100644 --- a/src/audio/tone/tone-ipc4.c +++ b/src/audio/tone/tone-ipc4.c @@ -17,7 +17,7 @@ #include #include #include -#include /* for SHARED_DATA */ +#include /* likely unneeded */ #include #include #include diff --git a/src/audio/tone/tone.c b/src/audio/tone/tone.c index 975e4ee06bc8..0941d7edcb69 100644 --- a/src/audio/tone/tone.c +++ b/src/audio/tone/tone.c @@ -17,7 +17,7 @@ #include #include #include -#include /* for SHARED_DATA */ +#include /* likely unneeded */ #include #include #include diff --git a/src/audio/tone/tone.h b/src/audio/tone/tone.h index 4183543e0beb..33c0862ef19c 100644 --- a/src/audio/tone/tone.h +++ b/src/audio/tone/tone.h @@ -14,7 +14,7 @@ #include #include #include -#include /* for SHARED_DATA */ +#include /* likely unneeded */ #include #include #include diff --git a/src/drivers/interrupt.c b/src/drivers/interrupt.c index afa07c4d1d46..a1215314cb9d 100644 --- a/src/drivers/interrupt.c +++ b/src/drivers/interrupt.c @@ -43,7 +43,7 @@ DECLARE_TR_CTX(irq_tr, SOF_UUID(irq_uuid), LOG_LEVEL_INFO); #define interrupt_disable mux_interrupt_disable #endif -static SHARED_DATA struct cascade_root cascade_root; +static struct cascade_root cascade_root; static int interrupt_register_internal(uint32_t irq, void (*handler)(void *arg), void *arg, struct irq_desc *desc); diff --git a/src/idc/idc.c b/src/idc/idc.c index 145a22abfa1c..195de0a18d2a 100644 --- a/src/idc/idc.c +++ b/src/idc/idc.c @@ -39,7 +39,7 @@ LOG_MODULE_REGISTER(idc, CONFIG_SOF_LOG_LEVEL); /** \brief IDC message payload per core. */ -static SHARED_DATA struct idc_payload static_payload[CONFIG_CORE_COUNT]; +static struct idc_payload static_payload[CONFIG_CORE_COUNT]; SOF_DEFINE_REG_UUID(idc); diff --git a/src/include/sof/audio/module_adapter/module/generic.h b/src/include/sof/audio/module_adapter/module/generic.h index e7ba1eabefab..625b3a180a60 100644 --- a/src/include/sof/audio/module_adapter/module/generic.h +++ b/src/include/sof/audio/module_adapter/module/generic.h @@ -78,7 +78,7 @@ static const struct comp_driver comp_##adapter##_module = { \ .adapter_ops = &(adapter), \ }; \ \ -static SHARED_DATA struct comp_driver_info comp_module_##adapter##_info = { \ +static struct comp_driver_info comp_module_##adapter##_info = { \ .drv = &comp_##adapter##_module, \ }; \ \ diff --git a/src/lib/clk.c b/src/lib/clk.c index 1b5025b616cb..89c159f20d31 100644 --- a/src/lib/clk.c +++ b/src/lib/clk.c @@ -24,7 +24,7 @@ SOF_DEFINE_REG_UUID(clock); DECLARE_TR_CTX(clock_tr, SOF_UUID(clock_uuid), LOG_LEVEL_INFO); -SHARED_DATA struct k_spinlock clk_lock; +struct k_spinlock clk_lock; static inline uint32_t clock_get_nearest_freq_idx(const struct freq_table *tab, uint32_t size, uint32_t hz) diff --git a/src/lib/notifier.c b/src/lib/notifier.c index 102dc55fc7b3..20770bd828a2 100644 --- a/src/lib/notifier.c +++ b/src/lib/notifier.c @@ -26,7 +26,7 @@ SOF_DEFINE_REG_UUID(notifier); DECLARE_TR_CTX(nt_tr, SOF_UUID(notifier_uuid), LOG_LEVEL_INFO); -static SHARED_DATA struct notify_data notify_data_shared[CONFIG_CORE_COUNT]; +static struct notify_data notify_data_shared[CONFIG_CORE_COUNT]; struct callback_handle { void *receiver; diff --git a/src/platform/amd/acp_6_3/include/platform/lib/memory.h b/src/platform/amd/acp_6_3/include/platform/lib/memory.h index 2b4fc43e6322..6c9e7c7f5b36 100644 --- a/src/platform/amd/acp_6_3/include/platform/lib/memory.h +++ b/src/platform/amd/acp_6_3/include/platform/lib/memory.h @@ -162,7 +162,6 @@ #if !defined(__ASSEMBLER__) && !defined(LINKER) struct sof; -#define SHARED_DATA void platform_init_memmap(struct sof *sof); static inline void *platform_rfree_prepare(void *ptr) diff --git a/src/platform/amd/acp_6_3/lib/clk.c b/src/platform/amd/acp_6_3/lib/clk.c index f060aafc22c6..9b39b46be987 100644 --- a/src/platform/amd/acp_6_3/lib/clk.c +++ b/src/platform/amd/acp_6_3/lib/clk.c @@ -51,7 +51,7 @@ const struct freq_table platform_cpu_freq[] = { STATIC_ASSERT(ARRAY_SIZE(platform_cpu_freq) == NUM_CPU_FREQ, invalid_number_of_cpu_frequencies); -static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS]; +static struct clock_info platform_clocks_info[NUM_CLOCKS]; void audio_pll_power_off(void); void audio_pll_power_on(void); diff --git a/src/platform/amd/acp_6_3/lib/dma.c b/src/platform/amd/acp_6_3/lib/dma.c index 01da5ce0b528..e41c081af9e9 100644 --- a/src/platform/amd/acp_6_3/lib/dma.c +++ b/src/platform/amd/acp_6_3/lib/dma.c @@ -25,7 +25,7 @@ extern struct dma_ops acp_dai_sp_dma_ops; extern struct dma_ops acp_dai_hs_dma_ops; extern struct dma_ops acp_dai_sw_audio_dma_ops; -SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = { +struct dma dma[PLATFORM_NUM_DMACS] = { { .plat_data = { .id = DMA_ID_DMA0, diff --git a/src/platform/amd/acp_6_3/lib/memory.c b/src/platform/amd/acp_6_3/lib/memory.c index 94047b7c488a..363f110516b5 100644 --- a/src/platform/amd/acp_6_3/lib/memory.c +++ b/src/platform/amd/acp_6_3/lib/memory.c @@ -12,29 +12,29 @@ #include /* Heap blocks for system runtime */ -static SHARED_DATA struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; -static SHARED_DATA struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; -static SHARED_DATA struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; +static struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; +static struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; +static struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; /* Heap memory for system runtime */ -static SHARED_DATA struct block_map sys_rt_heap_map[] = { +static struct block_map sys_rt_heap_map[] = { BLOCK_DEF(64, HEAP_SYS_RT_COUNT64, sys_rt_block64), BLOCK_DEF(512, HEAP_SYS_RT_COUNT512, sys_rt_block512), BLOCK_DEF(1024, HEAP_SYS_RT_COUNT1024, sys_rt_block1024), }; /* Heap blocks for modules */ -static SHARED_DATA struct block_hdr mod_block16[HEAP_RT_COUNT16]; -static SHARED_DATA struct block_hdr mod_block32[HEAP_RT_COUNT32]; -static SHARED_DATA struct block_hdr mod_block64[HEAP_RT_COUNT64]; -static SHARED_DATA struct block_hdr mod_block128[HEAP_RT_COUNT128]; -static SHARED_DATA struct block_hdr mod_block256[HEAP_RT_COUNT256]; -static SHARED_DATA struct block_hdr mod_block512[HEAP_RT_COUNT512]; -static SHARED_DATA struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; -static SHARED_DATA struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; +static struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; /* Heap memory map for modules */ -static SHARED_DATA struct block_map rt_heap_map[] = { +static struct block_map rt_heap_map[] = { BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), @@ -46,14 +46,14 @@ static SHARED_DATA struct block_map rt_heap_map[] = { }; /* Heap blocks for buffers */ -static SHARED_DATA struct block_hdr buf_block[HEAP_BUFFER_COUNT]; +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; /* Heap memory map for buffers */ -static SHARED_DATA struct block_map buf_heap_map[] = { +static struct block_map buf_heap_map[] = { BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), }; -static SHARED_DATA struct mm memmap = { +static struct mm memmap = { .system[0] = { .heap = HEAP_SYSTEM_BASE, .size = HEAP_SYSTEM_SIZE, diff --git a/src/platform/amd/acp_6_3/platform.c b/src/platform/amd/acp_6_3/platform.c index e0b1f2b8fe9f..e06cf8db0e2c 100644 --- a/src/platform/amd/acp_6_3/platform.c +++ b/src/platform/amd/acp_6_3/platform.c @@ -127,7 +127,7 @@ const struct ext_man_windows xsram_window }, }; -static SHARED_DATA struct timer timer = { +static struct timer timer = { .id = TIMER0, .irq = IRQ_NUM_TIMER0, }; diff --git a/src/platform/amd/acp_7_0/include/platform/lib/memory.h b/src/platform/amd/acp_7_0/include/platform/lib/memory.h index 60a72e9f38c1..214b638da4df 100644 --- a/src/platform/amd/acp_7_0/include/platform/lib/memory.h +++ b/src/platform/amd/acp_7_0/include/platform/lib/memory.h @@ -173,7 +173,6 @@ #if !defined(__ASSEMBLER__) && !defined(LINKER) struct sof; -#define SHARED_DATA void platform_init_memmap(struct sof *sof); static inline void *platform_rfree_prepare(void *ptr) diff --git a/src/platform/amd/acp_7_0/lib/clk.c b/src/platform/amd/acp_7_0/lib/clk.c index da2b069682d0..e0ab1baf8033 100644 --- a/src/platform/amd/acp_7_0/lib/clk.c +++ b/src/platform/amd/acp_7_0/lib/clk.c @@ -50,7 +50,7 @@ const struct freq_table platform_cpu_freq[] = { STATIC_ASSERT(ARRAY_SIZE(platform_cpu_freq) == NUM_CPU_FREQ, invalid_number_of_cpu_frequencies); -static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS]; +static struct clock_info platform_clocks_info[NUM_CLOCKS]; void audio_pll_power_off(void); void audio_pll_power_on(void); diff --git a/src/platform/amd/acp_7_0/lib/dma.c b/src/platform/amd/acp_7_0/lib/dma.c index bbc6b4a6cd8a..60fb1e631b5e 100644 --- a/src/platform/amd/acp_7_0/lib/dma.c +++ b/src/platform/amd/acp_7_0/lib/dma.c @@ -24,7 +24,7 @@ extern struct dma_ops acp_dai_sp_dma_ops; extern struct dma_ops acp_dai_hs_dma_ops; extern struct dma_ops acp_dai_sw_audio_dma_ops; -SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = { +struct dma dma[PLATFORM_NUM_DMACS] = { { .plat_data = { .id = DMA_ID_DMA0, diff --git a/src/platform/amd/acp_7_0/lib/memory.c b/src/platform/amd/acp_7_0/lib/memory.c index ce3925e95860..fa1caa2ae726 100644 --- a/src/platform/amd/acp_7_0/lib/memory.c +++ b/src/platform/amd/acp_7_0/lib/memory.c @@ -13,29 +13,29 @@ #include /* Heap blocks for system runtime */ -static SHARED_DATA struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; -static SHARED_DATA struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; -static SHARED_DATA struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; +static struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; +static struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; +static struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; /* Heap memory for system runtime */ -static SHARED_DATA struct block_map sys_rt_heap_map[] = { +static struct block_map sys_rt_heap_map[] = { BLOCK_DEF(64, HEAP_SYS_RT_COUNT64, sys_rt_block64), BLOCK_DEF(512, HEAP_SYS_RT_COUNT512, sys_rt_block512), BLOCK_DEF(1024, HEAP_SYS_RT_COUNT1024, sys_rt_block1024), }; /* Heap blocks for modules */ -static SHARED_DATA struct block_hdr mod_block16[HEAP_RT_COUNT16]; -static SHARED_DATA struct block_hdr mod_block32[HEAP_RT_COUNT32]; -static SHARED_DATA struct block_hdr mod_block64[HEAP_RT_COUNT64]; -static SHARED_DATA struct block_hdr mod_block128[HEAP_RT_COUNT128]; -static SHARED_DATA struct block_hdr mod_block256[HEAP_RT_COUNT256]; -static SHARED_DATA struct block_hdr mod_block512[HEAP_RT_COUNT512]; -static SHARED_DATA struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; -static SHARED_DATA struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; +static struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; /* Heap memory map for modules */ -static SHARED_DATA struct block_map rt_heap_map[] = { +static struct block_map rt_heap_map[] = { BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), @@ -47,14 +47,14 @@ static SHARED_DATA struct block_map rt_heap_map[] = { }; /* Heap blocks for buffers */ -static SHARED_DATA struct block_hdr buf_block[HEAP_BUFFER_COUNT]; +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; /* Heap memory map for buffers */ -static SHARED_DATA struct block_map buf_heap_map[] = { +static struct block_map buf_heap_map[] = { BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), }; -static SHARED_DATA struct mm memmap = { +static struct mm memmap = { .system[0] = { .heap = HEAP_SYSTEM_BASE, .size = HEAP_SYSTEM_SIZE, diff --git a/src/platform/amd/acp_7_x/include/platform/lib/memory.h b/src/platform/amd/acp_7_x/include/platform/lib/memory.h index df1007e50674..0a7039e4036b 100644 --- a/src/platform/amd/acp_7_x/include/platform/lib/memory.h +++ b/src/platform/amd/acp_7_x/include/platform/lib/memory.h @@ -228,7 +228,6 @@ #if !defined(__ASSEMBLER__) && !defined(LINKER) struct sof; -#define SHARED_DATA void platform_init_memmap(struct sof *sof); static inline void *platform_rfree_prepare(void *ptr) diff --git a/src/platform/amd/acp_7_x/lib/clk.c b/src/platform/amd/acp_7_x/lib/clk.c index 00aa89be48b2..1f0f3acd176e 100644 --- a/src/platform/amd/acp_7_x/lib/clk.c +++ b/src/platform/amd/acp_7_x/lib/clk.c @@ -68,7 +68,7 @@ typedef enum _acp_clock_type_ { } acp_clock_type_t; /* Static variables */ -static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS]; +static struct clock_info platform_clocks_info[NUM_CLOCKS]; /* Function prototypes */ void audio_pll_power_off(void); diff --git a/src/platform/amd/rembrandt/include/platform/lib/memory.h b/src/platform/amd/rembrandt/include/platform/lib/memory.h index bd618b6d9bdb..fb3f1fe30fe8 100644 --- a/src/platform/amd/rembrandt/include/platform/lib/memory.h +++ b/src/platform/amd/rembrandt/include/platform/lib/memory.h @@ -152,8 +152,6 @@ #if !defined(__ASSEMBLER__) && !defined(LINKER) struct sof; - -#define SHARED_DATA void platform_init_memmap(struct sof *sof); static inline void *platform_rfree_prepare(void *ptr) diff --git a/src/platform/amd/rembrandt/lib/clk.c b/src/platform/amd/rembrandt/lib/clk.c index 071e8c74168f..8f2529f21d57 100644 --- a/src/platform/amd/rembrandt/lib/clk.c +++ b/src/platform/amd/rembrandt/lib/clk.c @@ -19,7 +19,7 @@ const struct freq_table platform_cpu_freq[] = { STATIC_ASSERT(NUM_CPU_FREQ == ARRAY_SIZE(platform_cpu_freq), invalid_number_of_cpu_frequencies); -static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS]; +static struct clock_info platform_clocks_info[NUM_CLOCKS]; static int acp_reg_read_via_smn(uint32_t reg_offset, uint32_t size) diff --git a/src/platform/amd/rembrandt/lib/dma.c b/src/platform/amd/rembrandt/lib/dma.c index 66ddea8effe8..838e954dbc4e 100644 --- a/src/platform/amd/rembrandt/lib/dma.c +++ b/src/platform/amd/rembrandt/lib/dma.c @@ -25,7 +25,7 @@ extern struct dma_ops acp_dai_sp_dma_ops; #endif extern struct dma_ops acp_dai_hs_dma_ops; -SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = { +struct dma dma[PLATFORM_NUM_DMACS] = { { .plat_data = { .id = DMA_ID_DMA0, diff --git a/src/platform/amd/renoir/include/platform/lib/memory.h b/src/platform/amd/renoir/include/platform/lib/memory.h index 0d1df900e6fd..d9a3825fbc86 100644 --- a/src/platform/amd/renoir/include/platform/lib/memory.h +++ b/src/platform/amd/renoir/include/platform/lib/memory.h @@ -147,8 +147,6 @@ #if !defined(__ASSEMBLER__) && !defined(LINKER) struct sof; - -#define SHARED_DATA void platform_init_memmap(struct sof *sof); static inline void *platform_rfree_prepare(void *ptr) diff --git a/src/platform/amd/renoir/lib/clk.c b/src/platform/amd/renoir/lib/clk.c index 4880daafac71..ea81e756e9a1 100644 --- a/src/platform/amd/renoir/lib/clk.c +++ b/src/platform/amd/renoir/lib/clk.c @@ -19,7 +19,7 @@ static struct freq_table platform_cpu_freq[] = { STATIC_ASSERT(NUM_CPU_FREQ == ARRAY_SIZE(platform_cpu_freq), invalid_number_of_cpu_frequencies); -static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS]; +static struct clock_info platform_clocks_info[NUM_CLOCKS]; static int acp_reg_read_via_smn(uint32_t reg_offset, uint32_t size) diff --git a/src/platform/amd/renoir/lib/dma.c b/src/platform/amd/renoir/lib/dma.c index e6c75bee3905..2183a3464951 100644 --- a/src/platform/amd/renoir/lib/dma.c +++ b/src/platform/amd/renoir/lib/dma.c @@ -24,7 +24,7 @@ extern struct dma_ops acp_dai_bt_dma_ops; #endif extern struct dma_ops acp_dai_sp_dma_ops; -static SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = { +static struct dma dma[PLATFORM_NUM_DMACS] = { { .plat_data = { .id = DMA_ID_DMA0, diff --git a/src/platform/amd/renoir/lib/memory.c b/src/platform/amd/renoir/lib/memory.c index a5b33cbb24d6..bfee7c08174d 100644 --- a/src/platform/amd/renoir/lib/memory.c +++ b/src/platform/amd/renoir/lib/memory.c @@ -12,29 +12,29 @@ #include /* Heap blocks for system runtime */ -static SHARED_DATA struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; -static SHARED_DATA struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; -static SHARED_DATA struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; +static struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; +static struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; +static struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; /* Heap memory for system runtime */ -static SHARED_DATA struct block_map sys_rt_heap_map[] = { +static struct block_map sys_rt_heap_map[] = { BLOCK_DEF(64, HEAP_SYS_RT_COUNT64, sys_rt_block64), BLOCK_DEF(512, HEAP_SYS_RT_COUNT512, sys_rt_block512), BLOCK_DEF(1024, HEAP_SYS_RT_COUNT1024, sys_rt_block1024), }; /* Heap blocks for modules */ -static SHARED_DATA struct block_hdr mod_block16[HEAP_RT_COUNT16]; -static SHARED_DATA struct block_hdr mod_block32[HEAP_RT_COUNT32]; -static SHARED_DATA struct block_hdr mod_block64[HEAP_RT_COUNT64]; -static SHARED_DATA struct block_hdr mod_block128[HEAP_RT_COUNT128]; -static SHARED_DATA struct block_hdr mod_block256[HEAP_RT_COUNT256]; -static SHARED_DATA struct block_hdr mod_block512[HEAP_RT_COUNT512]; -static SHARED_DATA struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; -static SHARED_DATA struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; +static struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; /* Heap memory map for modules */ -static SHARED_DATA struct block_map rt_heap_map[] = { +static struct block_map rt_heap_map[] = { BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), @@ -46,14 +46,14 @@ static SHARED_DATA struct block_map rt_heap_map[] = { }; /* Heap blocks for buffers */ -static SHARED_DATA struct block_hdr buf_block[HEAP_BUFFER_COUNT]; +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; /* Heap memory map for buffers */ -static SHARED_DATA struct block_map buf_heap_map[] = { +static struct block_map buf_heap_map[] = { BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), }; -static SHARED_DATA struct mm memmap = { +static struct mm memmap = { .system[0] = { .heap = HEAP_SYSTEM_BASE, .size = HEAP_SYSTEM_SIZE, diff --git a/src/platform/amd/renoir/platform.c b/src/platform/amd/renoir/platform.c index 419f1251bd84..bccbd7c5c399 100644 --- a/src/platform/amd/renoir/platform.c +++ b/src/platform/amd/renoir/platform.c @@ -124,7 +124,7 @@ const struct ext_man_windows xsram_window }, }; -static SHARED_DATA struct timer timer_shared = { +static struct timer timer_shared = { .id = TIMER0, .irq = IRQ_NUM_TIMER0, }; diff --git a/src/platform/amd/vangogh/include/platform/lib/memory.h b/src/platform/amd/vangogh/include/platform/lib/memory.h index 49a12236833c..a9f42b597dd9 100644 --- a/src/platform/amd/vangogh/include/platform/lib/memory.h +++ b/src/platform/amd/vangogh/include/platform/lib/memory.h @@ -146,8 +146,6 @@ #if !defined(__ASSEMBLER__) && !defined(LINKER) struct sof; - -#define SHARED_DATA void platform_init_memmap(struct sof *sof); static inline void *platform_rfree_prepare(void *ptr) diff --git a/src/platform/amd/vangogh/lib/clk.c b/src/platform/amd/vangogh/lib/clk.c index 25f7befed373..b91472a739ce 100644 --- a/src/platform/amd/vangogh/lib/clk.c +++ b/src/platform/amd/vangogh/lib/clk.c @@ -21,7 +21,7 @@ const struct freq_table platform_cpu_freq[] = { STATIC_ASSERT(NUM_CPU_FREQ == ARRAY_SIZE(platform_cpu_freq), invalid_number_of_cpu_frequencies); -static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS]; +static struct clock_info platform_clocks_info[NUM_CLOCKS]; static int acp_reg_read_via_smn(uint32_t reg_offset, uint32_t size) diff --git a/src/platform/amd/vangogh/lib/dma.c b/src/platform/amd/vangogh/lib/dma.c index cd764542dcfa..3a16b1d1ba65 100644 --- a/src/platform/amd/vangogh/lib/dma.c +++ b/src/platform/amd/vangogh/lib/dma.c @@ -23,7 +23,7 @@ extern struct dma_ops acp_dai_bt_dma_ops; extern struct dma_ops acp_dai_sp_dma_ops; extern struct dma_ops acp_dai_hs_dma_ops; -SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = { +struct dma dma[PLATFORM_NUM_DMACS] = { { .plat_data = { .id = DMA_ID_DMA0, diff --git a/src/platform/amd/vangogh/lib/memory.c b/src/platform/amd/vangogh/lib/memory.c index d4a0ab144706..566175154721 100644 --- a/src/platform/amd/vangogh/lib/memory.c +++ b/src/platform/amd/vangogh/lib/memory.c @@ -13,29 +13,29 @@ #include /* Heap blocks for system runtime */ -static SHARED_DATA struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; -static SHARED_DATA struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; -static SHARED_DATA struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; +static struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; +static struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; +static struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; /* Heap memory for system runtime */ -static SHARED_DATA struct block_map sys_rt_heap_map[] = { +static struct block_map sys_rt_heap_map[] = { BLOCK_DEF(64, HEAP_SYS_RT_COUNT64, sys_rt_block64), BLOCK_DEF(512, HEAP_SYS_RT_COUNT512, sys_rt_block512), BLOCK_DEF(1024, HEAP_SYS_RT_COUNT1024, sys_rt_block1024), }; /* Heap blocks for modules */ -static SHARED_DATA struct block_hdr mod_block16[HEAP_RT_COUNT16]; -static SHARED_DATA struct block_hdr mod_block32[HEAP_RT_COUNT32]; -static SHARED_DATA struct block_hdr mod_block64[HEAP_RT_COUNT64]; -static SHARED_DATA struct block_hdr mod_block128[HEAP_RT_COUNT128]; -static SHARED_DATA struct block_hdr mod_block256[HEAP_RT_COUNT256]; -static SHARED_DATA struct block_hdr mod_block512[HEAP_RT_COUNT512]; -static SHARED_DATA struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; -static SHARED_DATA struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; +static struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; /* Heap memory map for modules */ -static SHARED_DATA struct block_map rt_heap_map[] = { +static struct block_map rt_heap_map[] = { BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), @@ -47,14 +47,14 @@ static SHARED_DATA struct block_map rt_heap_map[] = { }; /* Heap blocks for buffers */ -static SHARED_DATA struct block_hdr buf_block[HEAP_BUFFER_COUNT]; +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; /* Heap memory map for buffers */ -static SHARED_DATA struct block_map buf_heap_map[] = { +static struct block_map buf_heap_map[] = { BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), }; -static SHARED_DATA struct mm memmap = { +static struct mm memmap = { .system[0] = { .heap = HEAP_SYSTEM_BASE, .size = HEAP_SYSTEM_SIZE, diff --git a/src/platform/amd/vangogh/platform.c b/src/platform/amd/vangogh/platform.c index 300239a023be..da2c24bfb067 100644 --- a/src/platform/amd/vangogh/platform.c +++ b/src/platform/amd/vangogh/platform.c @@ -123,7 +123,7 @@ const struct ext_man_windows xsram_window }, }; -static SHARED_DATA struct timer timer = { +static struct timer timer = { .id = TIMER0, .irq = IRQ_NUM_TIMER0, }; diff --git a/src/platform/imx8/include/platform/lib/memory.h b/src/platform/imx8/include/platform/lib/memory.h index 674d1af2611f..862abcd49d25 100644 --- a/src/platform/imx8/include/platform/lib/memory.h +++ b/src/platform/imx8/include/platform/lib/memory.h @@ -179,12 +179,6 @@ struct sof; -/** - * \brief Data shared between different cores. - * Does nothing, since IMX doesn't support SMP. - */ -#define SHARED_DATA - void platform_init_memmap(struct sof *sof); #define uncache_to_cache(address) address @@ -195,9 +189,8 @@ void platform_init_memmap(struct sof *sof); /** * \brief Function for keeping shared data synchronized. * It's used after usage of data shared by different cores. - * Such data is either statically marked with SHARED_DATA - * or dynamically allocated with SOF_MEM_FLAG_SHARED flag. - * Does nothing, since IMX doesn't support SMP. + * Such data is dynamically allocated with SOF_MEM_FLAG_SHARED + * flag. Does nothing, since IMX doesn't support SMP. */ static inline void *platform_rfree_prepare(void *ptr) diff --git a/src/platform/imx8/lib/clk.c b/src/platform/imx8/lib/clk.c index 152cac1752d7..4eeb2dac3357 100644 --- a/src/platform/imx8/lib/clk.c +++ b/src/platform/imx8/lib/clk.c @@ -24,7 +24,7 @@ const struct freq_table platform_cpu_freq[] = { STATIC_ASSERT(NUM_CPU_FREQ == ARRAY_SIZE(platform_cpu_freq), invalid_number_of_cpu_frequencies); -static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS]; +static struct clock_info platform_clocks_info[NUM_CLOCKS]; void platform_clock_init(struct sof *sof) { diff --git a/src/platform/imx8/lib/dai.c b/src/platform/imx8/lib/dai.c index 69366cf18d3f..a0f8fcc39135 100644 --- a/src/platform/imx8/lib/dai.c +++ b/src/platform/imx8/lib/dai.c @@ -15,7 +15,7 @@ #include #include -static SHARED_DATA struct dai esai[] = { +static struct dai esai[] = { { .index = 0, .plat_data = { @@ -39,7 +39,7 @@ static SHARED_DATA struct dai esai[] = { }, }; -static SHARED_DATA struct dai sai[] = { +static struct dai sai[] = { { .index = 1, .plat_data = { diff --git a/src/platform/imx8/lib/dma.c b/src/platform/imx8/lib/dma.c index e5a40d251557..dc3efa653d0a 100644 --- a/src/platform/imx8/lib/dma.c +++ b/src/platform/imx8/lib/dma.c @@ -22,7 +22,7 @@ static const int edma0_ints[EDMA0_CHAN_MAX] = { [EDMA0_SAI_CHAN_TX] = EDMA0_SAI_CHAN_TX_IRQ, }; -static SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = { +static struct dma dma[PLATFORM_NUM_DMACS] = { { .plat_data = { .id = DMA_ID_EDMA0, diff --git a/src/platform/imx8/lib/memory.c b/src/platform/imx8/lib/memory.c index d4527d756ac1..81794bafd6d6 100644 --- a/src/platform/imx8/lib/memory.c +++ b/src/platform/imx8/lib/memory.c @@ -12,29 +12,29 @@ #include /* Heap blocks for system runtime */ -static SHARED_DATA struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; -static SHARED_DATA struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; -static SHARED_DATA struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; +static struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; +static struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; +static struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; /* Heap memory for system runtime */ -static SHARED_DATA struct block_map sys_rt_heap_map[] = { +static struct block_map sys_rt_heap_map[] = { BLOCK_DEF(64, HEAP_SYS_RT_COUNT64, sys_rt_block64), BLOCK_DEF(512, HEAP_SYS_RT_COUNT512, sys_rt_block512), BLOCK_DEF(1024, HEAP_SYS_RT_COUNT1024, sys_rt_block1024), }; /* Heap blocks for modules */ -static SHARED_DATA struct block_hdr mod_block16[HEAP_RT_COUNT16]; -static SHARED_DATA struct block_hdr mod_block32[HEAP_RT_COUNT32]; -static SHARED_DATA struct block_hdr mod_block64[HEAP_RT_COUNT64]; -static SHARED_DATA struct block_hdr mod_block128[HEAP_RT_COUNT128]; -static SHARED_DATA struct block_hdr mod_block256[HEAP_RT_COUNT256]; -static SHARED_DATA struct block_hdr mod_block512[HEAP_RT_COUNT512]; -static SHARED_DATA struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; -static SHARED_DATA struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; +static struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; /* Heap memory map for modules */ -static SHARED_DATA struct block_map rt_heap_map[] = { +static struct block_map rt_heap_map[] = { BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), @@ -46,14 +46,14 @@ static SHARED_DATA struct block_map rt_heap_map[] = { }; /* Heap blocks for buffers */ -static SHARED_DATA struct block_hdr buf_block[HEAP_BUFFER_COUNT]; +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; /* Heap memory map for buffers */ -static SHARED_DATA struct block_map buf_heap_map[] = { +static struct block_map buf_heap_map[] = { BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), }; -static SHARED_DATA struct mm memmap = { +static struct mm memmap = { .system[0] = { .heap = HEAP_SYSTEM_BASE, .size = HEAP_SYSTEM_SIZE, diff --git a/src/platform/imx8m/include/platform/lib/memory.h b/src/platform/imx8m/include/platform/lib/memory.h index 490e65a0052d..671a9ca77095 100644 --- a/src/platform/imx8m/include/platform/lib/memory.h +++ b/src/platform/imx8m/include/platform/lib/memory.h @@ -198,12 +198,6 @@ struct sof; -/** - * \brief Data shared between different cores. - * Does nothing, since IMX doesn't support SMP. - */ -#define SHARED_DATA - void platform_init_memmap(struct sof *sof); #define uncache_to_cache(address) address @@ -214,9 +208,8 @@ void platform_init_memmap(struct sof *sof); /** * \brief Function for keeping shared data synchronized. * It's used after usage of data shared by different cores. - * Such data is either statically marked with SHARED_DATA - * or dynamically allocated with SOF_MEM_FLAG_SHARED flag. - * Does nothing, since IMX doesn't support SMP. + * Such data is dynamically allocated with SOF_MEM_FLAG_SHARED + * flag. Does nothing, since IMX doesn't support SMP. */ static inline void *platform_rfree_prepare(void *ptr) diff --git a/src/platform/imx8m/lib/clk.c b/src/platform/imx8m/lib/clk.c index 78aacfd05e28..573858873ef8 100644 --- a/src/platform/imx8m/lib/clk.c +++ b/src/platform/imx8m/lib/clk.c @@ -19,7 +19,7 @@ const struct freq_table platform_cpu_freq[] = { STATIC_ASSERT(NUM_CPU_FREQ == ARRAY_SIZE(platform_cpu_freq), invalid_number_of_cpu_frequencies); -static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS]; +static struct clock_info platform_clocks_info[NUM_CLOCKS]; void platform_clock_init(struct sof *sof) { diff --git a/src/platform/imx8m/lib/dai.c b/src/platform/imx8m/lib/dai.c index 1293cdc6fd7f..433c27ef141a 100644 --- a/src/platform/imx8m/lib/dai.c +++ b/src/platform/imx8m/lib/dai.c @@ -15,7 +15,7 @@ #include #include -static SHARED_DATA struct dai sai[] = { +static struct dai sai[] = { { .index = 1, .plat_data = { @@ -144,7 +144,7 @@ static SHARED_DATA struct dai sai[] = { }; -static SHARED_DATA struct dai micfil[] = { +static struct dai micfil[] = { { .index = 2, .plat_data = { diff --git a/src/platform/imx8m/lib/dma.c b/src/platform/imx8m/lib/dma.c index f9cb5a74682a..c9fe4a98e030 100644 --- a/src/platform/imx8m/lib/dma.c +++ b/src/platform/imx8m/lib/dma.c @@ -14,7 +14,7 @@ extern struct dma_ops dummy_dma_ops; extern struct dma_ops sdma_ops; -static SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = { +static struct dma dma[PLATFORM_NUM_DMACS] = { { .plat_data = { .id = DMA_ID_HOST, diff --git a/src/platform/imx8m/lib/memory.c b/src/platform/imx8m/lib/memory.c index 9f26cd3ebe80..3f2eceee1afb 100644 --- a/src/platform/imx8m/lib/memory.c +++ b/src/platform/imx8m/lib/memory.c @@ -12,30 +12,30 @@ #include /* Heap blocks for system runtime */ -static SHARED_DATA struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; -static SHARED_DATA struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; -static SHARED_DATA struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; +static struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; +static struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; +static struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; /* Heap memory for system runtime */ -static SHARED_DATA struct block_map sys_rt_heap_map[] = { +static struct block_map sys_rt_heap_map[] = { BLOCK_DEF(64, HEAP_SYS_RT_COUNT64, sys_rt_block64), BLOCK_DEF(512, HEAP_SYS_RT_COUNT512, sys_rt_block512), BLOCK_DEF(1024, HEAP_SYS_RT_COUNT1024, sys_rt_block1024), }; /* Heap blocks for modules */ -static SHARED_DATA struct block_hdr mod_block16[HEAP_RT_COUNT16]; -static SHARED_DATA struct block_hdr mod_block32[HEAP_RT_COUNT32]; -static SHARED_DATA struct block_hdr mod_block64[HEAP_RT_COUNT64]; -static SHARED_DATA struct block_hdr mod_block128[HEAP_RT_COUNT128]; -static SHARED_DATA struct block_hdr mod_block256[HEAP_RT_COUNT256]; -static SHARED_DATA struct block_hdr mod_block512[HEAP_RT_COUNT512]; -static SHARED_DATA struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; -static SHARED_DATA struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; -static SHARED_DATA struct block_hdr mod_block4096[HEAP_RT_COUNT4096]; +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; +static struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; +static struct block_hdr mod_block4096[HEAP_RT_COUNT4096]; /* Heap memory map for modules */ -static SHARED_DATA struct block_map rt_heap_map[] = { +static struct block_map rt_heap_map[] = { BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), @@ -48,14 +48,14 @@ static SHARED_DATA struct block_map rt_heap_map[] = { }; /* Heap blocks for buffers */ -static SHARED_DATA struct block_hdr buf_block[HEAP_BUFFER_COUNT]; +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; /* Heap memory map for buffers */ -static SHARED_DATA struct block_map buf_heap_map[] = { +static struct block_map buf_heap_map[] = { BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), }; -static SHARED_DATA struct mm memmap = { +static struct mm memmap = { .system[0] = { .heap = HEAP_SYSTEM_BASE, .size = HEAP_SYSTEM_SIZE, diff --git a/src/platform/imx8m_cm7/include/platform/lib/memory.h b/src/platform/imx8m_cm7/include/platform/lib/memory.h index af0b0b823e24..14886bf371fc 100644 --- a/src/platform/imx8m_cm7/include/platform/lib/memory.h +++ b/src/platform/imx8m_cm7/include/platform/lib/memory.h @@ -12,8 +12,6 @@ #define PLATFORM_DCACHE_ALIGN DCACHE_LINE_SIZE -#define SHARED_DATA - #define uncache_to_cache(address) address #define cache_to_uncache(address) address #define cache_to_uncache_init(address) address diff --git a/src/platform/imx8ulp/include/platform/lib/memory.h b/src/platform/imx8ulp/include/platform/lib/memory.h index ee74e6989e86..a84c6f56da48 100644 --- a/src/platform/imx8ulp/include/platform/lib/memory.h +++ b/src/platform/imx8ulp/include/platform/lib/memory.h @@ -182,12 +182,6 @@ struct sof; -/** - * \brief Data shared between different cores. - * Does nothing, since IMX doesn't support SMP. - */ -#define SHARED_DATA - void platform_init_memmap(struct sof *sof); #define uncache_to_cache(address) address @@ -198,9 +192,8 @@ void platform_init_memmap(struct sof *sof); /** * \brief Function for keeping shared data synchronized. * It's used after usage of data shared by different cores. - * Such data is either statically marked with SHARED_DATA - * or dynamically allocated with SOF_MEM_FLAG_SHARED flag. - * Does nothing, since IMX doesn't support SMP. + * Such data is dynamically allocated with SOF_MEM_FLAG_SHARED + * flag. Does nothing, since IMX doesn't support SMP. */ static inline void platform_shared_commit(void *ptr, int bytes) { } diff --git a/src/platform/imx8ulp/lib/clk.c b/src/platform/imx8ulp/lib/clk.c index 93a0a83ed54d..3bdc873eacf9 100644 --- a/src/platform/imx8ulp/lib/clk.c +++ b/src/platform/imx8ulp/lib/clk.c @@ -19,7 +19,7 @@ const struct freq_table platform_cpu_freq[] = { STATIC_ASSERT(NUM_CPU_FREQ == ARRAY_SIZE(platform_cpu_freq), invalid_number_of_cpu_frequencies); -static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS]; +static struct clock_info platform_clocks_info[NUM_CLOCKS]; void platform_clock_init(struct sof *sof) { diff --git a/src/platform/imx8ulp/lib/dai.c b/src/platform/imx8ulp/lib/dai.c index 879da871ffcb..797bbc3260be 100644 --- a/src/platform/imx8ulp/lib/dai.c +++ b/src/platform/imx8ulp/lib/dai.c @@ -14,7 +14,7 @@ #include #include -static SHARED_DATA struct dai sai[] = { +static struct dai sai[] = { { .index = 5, .plat_data = { diff --git a/src/platform/imx8ulp/lib/dma.c b/src/platform/imx8ulp/lib/dma.c index 0cfc47f68039..81b3e0f09de2 100644 --- a/src/platform/imx8ulp/lib/dma.c +++ b/src/platform/imx8ulp/lib/dma.c @@ -20,7 +20,7 @@ static const int edma2_ints[IMX8ULP_EDMA2_CHAN_MAX] = { [IMX8ULP_EDMA2_CHAN1] = IMX8ULP_EDMA2_CHAN1_IRQ, }; -static SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = { +static struct dma dma[PLATFORM_NUM_DMACS] = { { .plat_data = { .id = DMA_ID_EDMA2, diff --git a/src/platform/imx8ulp/lib/memory.c b/src/platform/imx8ulp/lib/memory.c index cafd4b5d3d0c..9224dae6e05f 100644 --- a/src/platform/imx8ulp/lib/memory.c +++ b/src/platform/imx8ulp/lib/memory.c @@ -13,29 +13,29 @@ #include /* Heap blocks for system runtime */ -static SHARED_DATA struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; -static SHARED_DATA struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; -static SHARED_DATA struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; +static struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; +static struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; +static struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; /* Heap memory for system runtime */ -static SHARED_DATA struct block_map sys_rt_heap_map[] = { +static struct block_map sys_rt_heap_map[] = { BLOCK_DEF(64, HEAP_SYS_RT_COUNT64, sys_rt_block64), BLOCK_DEF(512, HEAP_SYS_RT_COUNT512, sys_rt_block512), BLOCK_DEF(1024, HEAP_SYS_RT_COUNT1024, sys_rt_block1024), }; /* Heap blocks for modules */ -static SHARED_DATA struct block_hdr mod_block16[HEAP_RT_COUNT16]; -static SHARED_DATA struct block_hdr mod_block32[HEAP_RT_COUNT32]; -static SHARED_DATA struct block_hdr mod_block64[HEAP_RT_COUNT64]; -static SHARED_DATA struct block_hdr mod_block128[HEAP_RT_COUNT128]; -static SHARED_DATA struct block_hdr mod_block256[HEAP_RT_COUNT256]; -static SHARED_DATA struct block_hdr mod_block512[HEAP_RT_COUNT512]; -static SHARED_DATA struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; -static SHARED_DATA struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; +static struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; /* Heap memory map for modules */ -static SHARED_DATA struct block_map rt_heap_map[] = { +static struct block_map rt_heap_map[] = { BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), @@ -47,14 +47,14 @@ static SHARED_DATA struct block_map rt_heap_map[] = { }; /* Heap blocks for buffers */ -static SHARED_DATA struct block_hdr buf_block[HEAP_BUFFER_COUNT]; +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; /* Heap memory map for buffers */ -static SHARED_DATA struct block_map buf_heap_map[] = { +static struct block_map buf_heap_map[] = { BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), }; -static SHARED_DATA struct mm memmap = { +static struct mm memmap = { .system[0] = { .heap = HEAP_SYSTEM_BASE, .size = HEAP_SYSTEM_SIZE, diff --git a/src/platform/imx93_a55/include/platform/lib/memory.h b/src/platform/imx93_a55/include/platform/lib/memory.h index b9c84ff42a7f..6b74eb7e5d53 100644 --- a/src/platform/imx93_a55/include/platform/lib/memory.h +++ b/src/platform/imx93_a55/include/platform/lib/memory.h @@ -20,8 +20,6 @@ * thing so all the below cache/shared data "management" * functions aren't necessary. */ -#define SHARED_DATA - #define uncache_to_cache(address) address #define cache_to_uncache(address) address #define cache_to_uncache_init(address) address diff --git a/src/platform/imx95/include/platform/lib/memory.h b/src/platform/imx95/include/platform/lib/memory.h index 552c20e32530..0679e74242de 100644 --- a/src/platform/imx95/include/platform/lib/memory.h +++ b/src/platform/imx95/include/platform/lib/memory.h @@ -12,8 +12,6 @@ #define PLATFORM_DCACHE_ALIGN DCACHE_LINE_SIZE -#define SHARED_DATA - #define uncache_to_cache(address) address #define cache_to_uncache(address) address #define cache_to_uncache_init(address) address diff --git a/src/platform/intel/ace/include/ace/lib/memory.h b/src/platform/intel/ace/include/ace/lib/memory.h index f5740a7d659d..803acec71ce9 100644 --- a/src/platform/intel/ace/include/ace/lib/memory.h +++ b/src/platform/intel/ace/include/ace/lib/memory.h @@ -19,14 +19,6 @@ /* data cache line alignment */ #define PLATFORM_DCACHE_ALIGN DCACHE_LINE_SIZE -/** - * \brief Data shared between different cores. - * Placed into dedicated section, which should be accessed through - * uncached memory region. SMP platforms without uncache can simply - * align to cache line size instead. - */ -#define SHARED_DATA - #include #define uncache_to_cache(address) sys_cache_cached_ptr_get(address) diff --git a/src/platform/intel/cavs/include/cavs/lib/memory.h b/src/platform/intel/cavs/include/cavs/lib/memory.h index 0473131da6c8..ee8cd030df3c 100644 --- a/src/platform/intel/cavs/include/cavs/lib/memory.h +++ b/src/platform/intel/cavs/include/cavs/lib/memory.h @@ -33,18 +33,6 @@ struct sof; -/** - * \brief Data shared between different cores. - * Placed into dedicated section, which should be accessed through - * uncached memory region. SMP platforms without uncache can simply - * align to cache line size instead. - */ -#if !defined(UNIT_TEST) && !defined __ZEPHYR__ -#define SHARED_DATA __section(".shared_data") __attribute__((aligned(PLATFORM_DCACHE_ALIGN))) -#else -#define SHARED_DATA -#endif - #define SRAM_ALIAS_BASE 0x9E000000 #define SRAM_ALIAS_MASK 0xFF000000 #define SRAM_ALIAS_OFFSET SRAM_UNCACHED_ALIAS diff --git a/src/platform/library/include/platform/lib/memory.h b/src/platform/library/include/platform/lib/memory.h index 11f0114c1dde..4fe40783573c 100644 --- a/src/platform/library/include/platform/lib/memory.h +++ b/src/platform/library/include/platform/lib/memory.h @@ -35,8 +35,6 @@ uint8_t *get_library_mailbox(void); #define PLATFORM_HEAP_SYSTEM_SHARED 1 #define PLATFORM_HEAP_RUNTIME_SHARED 1 -#define SHARED_DATA - void platform_init_memmap(struct sof *sof); static inline void *platform_rfree_prepare(void *ptr) diff --git a/src/platform/library/lib/memory.c b/src/platform/library/lib/memory.c index 1a03d1ecf503..3f92c62889d7 100644 --- a/src/platform/library/lib/memory.c +++ b/src/platform/library/lib/memory.c @@ -27,22 +27,22 @@ #define HEAP_BUFFER_BASE 0xBE1C0000 /* Heap blocks for system runtime for primary core */ -static SHARED_DATA struct block_hdr sys_rt_0_block64[HEAP_SYS_RT_0_COUNT64]; -static SHARED_DATA struct block_hdr sys_rt_0_block512[HEAP_SYS_RT_0_COUNT512]; -static SHARED_DATA struct block_hdr sys_rt_0_block1024[HEAP_SYS_RT_0_COUNT1024]; +static struct block_hdr sys_rt_0_block64[HEAP_SYS_RT_0_COUNT64]; +static struct block_hdr sys_rt_0_block512[HEAP_SYS_RT_0_COUNT512]; +static struct block_hdr sys_rt_0_block1024[HEAP_SYS_RT_0_COUNT1024]; /* Heap blocks for system runtime for secondary core */ #if CONFIG_CORE_COUNT > 1 -static SHARED_DATA struct block_hdr +static struct block_hdr sys_rt_x_block64[CONFIG_CORE_COUNT - 1][HEAP_SYS_RT_X_COUNT64]; -static SHARED_DATA struct block_hdr +static struct block_hdr sys_rt_x_block512[CONFIG_CORE_COUNT - 1][HEAP_SYS_RT_X_COUNT512]; -static SHARED_DATA struct block_hdr +static struct block_hdr sys_rt_x_block1024[CONFIG_CORE_COUNT - 1][HEAP_SYS_RT_X_COUNT1024]; #endif /* Heap memory for system runtime */ -static SHARED_DATA struct block_map sys_rt_heap_map[CONFIG_CORE_COUNT][3] = { +static struct block_map sys_rt_heap_map[CONFIG_CORE_COUNT][3] = { { BLOCK_DEF(64, HEAP_SYS_RT_0_COUNT64, uncached_block_hdr(sys_rt_0_block64)), BLOCK_DEF(512, HEAP_SYS_RT_0_COUNT512, @@ -76,16 +76,16 @@ static SHARED_DATA struct block_map sys_rt_heap_map[CONFIG_CORE_COUNT][3] = { }; /* Heap blocks for modules */ -static SHARED_DATA struct block_hdr mod_block64[HEAP_COUNT64]; -static SHARED_DATA struct block_hdr mod_block128[HEAP_COUNT128]; -static SHARED_DATA struct block_hdr mod_block256[HEAP_COUNT256]; -static SHARED_DATA struct block_hdr mod_block512[HEAP_COUNT512]; -static SHARED_DATA struct block_hdr mod_block1024[HEAP_COUNT1024]; -static SHARED_DATA struct block_hdr mod_block2048[HEAP_COUNT2048]; -static SHARED_DATA struct block_hdr mod_block4096[HEAP_COUNT4096]; +static struct block_hdr mod_block64[HEAP_COUNT64]; +static struct block_hdr mod_block128[HEAP_COUNT128]; +static struct block_hdr mod_block256[HEAP_COUNT256]; +static struct block_hdr mod_block512[HEAP_COUNT512]; +static struct block_hdr mod_block1024[HEAP_COUNT1024]; +static struct block_hdr mod_block2048[HEAP_COUNT2048]; +static struct block_hdr mod_block4096[HEAP_COUNT4096]; /* Heap memory map for modules */ -static SHARED_DATA struct block_map rt_heap_map[] = { +static struct block_map rt_heap_map[] = { BLOCK_DEF(64, HEAP_COUNT64, uncached_block_hdr(mod_block64)), BLOCK_DEF(128, HEAP_COUNT128, uncached_block_hdr(mod_block128)), BLOCK_DEF(256, HEAP_COUNT256, uncached_block_hdr(mod_block256)), @@ -97,14 +97,14 @@ static SHARED_DATA struct block_map rt_heap_map[] = { #if CONFIG_CORE_COUNT > 1 /* Heap blocks for runtime shared */ -static SHARED_DATA struct block_hdr rt_shared_block64[HEAP_RUNTIME_SHARED_COUNT64]; -static SHARED_DATA struct block_hdr rt_shared_block128[HEAP_RUNTIME_SHARED_COUNT128]; -static SHARED_DATA struct block_hdr rt_shared_block256[HEAP_RUNTIME_SHARED_COUNT256]; -static SHARED_DATA struct block_hdr rt_shared_block512[HEAP_RUNTIME_SHARED_COUNT512]; -static SHARED_DATA struct block_hdr rt_shared_block1024[HEAP_RUNTIME_SHARED_COUNT1024]; +static struct block_hdr rt_shared_block64[HEAP_RUNTIME_SHARED_COUNT64]; +static struct block_hdr rt_shared_block128[HEAP_RUNTIME_SHARED_COUNT128]; +static struct block_hdr rt_shared_block256[HEAP_RUNTIME_SHARED_COUNT256]; +static struct block_hdr rt_shared_block512[HEAP_RUNTIME_SHARED_COUNT512]; +static struct block_hdr rt_shared_block1024[HEAP_RUNTIME_SHARED_COUNT1024]; /* Heap memory map for runtime shared */ -static SHARED_DATA struct block_map rt_shared_heap_map[] = { +static struct block_map rt_shared_heap_map[] = { BLOCK_DEF(64, HEAP_RUNTIME_SHARED_COUNT64, uncached_block_hdr(rt_shared_block64)), BLOCK_DEF(128, HEAP_RUNTIME_SHARED_COUNT128, uncached_block_hdr(rt_shared_block128)), BLOCK_DEF(256, HEAP_RUNTIME_SHARED_COUNT256, uncached_block_hdr(rt_shared_block256)), @@ -114,21 +114,21 @@ static SHARED_DATA struct block_map rt_shared_heap_map[] = { #endif /* Heap blocks for buffers */ -static SHARED_DATA struct block_hdr buf_block[HEAP_BUFFER_COUNT_MAX]; -static SHARED_DATA struct block_hdr lp_buf_block[HEAP_LP_BUFFER_COUNT]; +static struct block_hdr buf_block[HEAP_BUFFER_COUNT_MAX]; +static struct block_hdr lp_buf_block[HEAP_LP_BUFFER_COUNT]; /* Heap memory map for buffers */ -static SHARED_DATA struct block_map buf_heap_map[] = { +static struct block_map buf_heap_map[] = { BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT_MAX, uncached_block_hdr(buf_block)), }; -static SHARED_DATA struct block_map lp_buf_heap_map[] = { +static struct block_map lp_buf_heap_map[] = { BLOCK_DEF(HEAP_LP_BUFFER_BLOCK_SIZE, HEAP_LP_BUFFER_COUNT, uncached_block_hdr(lp_buf_block)), }; -static SHARED_DATA struct mm memmap; +static struct mm memmap; void platform_init_memmap(struct sof *sof) { diff --git a/src/platform/library/platform.c b/src/platform/library/platform.c index 756c34c996f4..ced1dcbca32d 100644 --- a/src/platform/library/platform.c +++ b/src/platform/library/platform.c @@ -13,7 +13,7 @@ #include #include -static SHARED_DATA struct timer timer = {}; +static struct timer timer = {}; static uint8_t mailbox[MAILBOX_DSPBOX_SIZE + MAILBOX_HOSTBOX_SIZE + diff --git a/src/platform/mt8186/include/platform/lib/memory.h b/src/platform/mt8186/include/platform/lib/memory.h index 305e4c917846..68c95bb53db0 100644 --- a/src/platform/mt8186/include/platform/lib/memory.h +++ b/src/platform/mt8186/include/platform/lib/memory.h @@ -184,12 +184,6 @@ struct sof; -/** - * \brief Data shared between different cores. - * Does nothing, since mt8186 doesn't support SMP. - */ -#define SHARED_DATA - void platform_init_memmap(struct sof *sof); #define uncache_to_cache(address) address @@ -200,9 +194,8 @@ void platform_init_memmap(struct sof *sof); /** * \brief Function for keeping shared data synchronized. * It's used after usage of data shared by different cores. - * Such data is either statically marked with SHARED_DATA - * or dynamically allocated with SOF_MEM_FLAG_SHARED flag. - * Does nothing, since mt8186 doesn't support SMP. + * Such data is dynamically allocated with SOF_MEM_FLAG_SHARED + * flag. Does nothing, since mt8186 doesn't support SMP. */ static inline void *platform_rfree_prepare(void *ptr) diff --git a/src/platform/mt8186/lib/clk.c b/src/platform/mt8186/lib/clk.c index 6a5b2910c506..b1b88ff9fe7b 100644 --- a/src/platform/mt8186/lib/clk.c +++ b/src/platform/mt8186/lib/clk.c @@ -32,7 +32,7 @@ const struct freq_table platform_cpu_freq[] = { STATIC_ASSERT(ARRAY_SIZE(platform_cpu_freq) == NUM_CPU_FREQ, invalid_number_of_cpu_frequencies); -static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS]; +static struct clock_info platform_clocks_info[NUM_CLOCKS]; static void clk_dsppll_enable(uint32_t value) { diff --git a/src/platform/mt8186/lib/dai.c b/src/platform/mt8186/lib/dai.c index 4d302d48fbdc..a45056846a2e 100644 --- a/src/platform/mt8186/lib/dai.c +++ b/src/platform/mt8186/lib/dai.c @@ -23,7 +23,7 @@ static int afe_dai_handshake[MT8186_DAI_NUM] = { AFE_HANDSHAKE(MT8186_AFE_IO_I2S0, MT8186_IRQ_12, MT8186_MEMIF_UL2), }; -static SHARED_DATA struct dai afe_dai[MT8186_DAI_NUM]; +static struct dai afe_dai[MT8186_DAI_NUM]; const struct dai_type_info dti[] = { { diff --git a/src/platform/mt8186/lib/dma.c b/src/platform/mt8186/lib/dma.c index db00628ae547..a8e3308367fc 100644 --- a/src/platform/mt8186/lib/dma.c +++ b/src/platform/mt8186/lib/dma.c @@ -19,7 +19,7 @@ extern const struct dma_ops dummy_dma_ops; -static SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = { +static struct dma dma[PLATFORM_NUM_DMACS] = { { .plat_data = { .id = DMA_ID_HOST, diff --git a/src/platform/mt8186/lib/memory.c b/src/platform/mt8186/lib/memory.c index 1ffc41859713..beae268b7f6f 100644 --- a/src/platform/mt8186/lib/memory.c +++ b/src/platform/mt8186/lib/memory.c @@ -13,30 +13,30 @@ #include /* Heap blocks for system runtime */ -static SHARED_DATA struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; -static SHARED_DATA struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; -static SHARED_DATA struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; +static struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; +static struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; +static struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; /* Heap memory for system runtime */ -static SHARED_DATA struct block_map sys_rt_heap_map[] = { +static struct block_map sys_rt_heap_map[] = { BLOCK_DEF(64, HEAP_SYS_RT_COUNT64, sys_rt_block64), BLOCK_DEF(512, HEAP_SYS_RT_COUNT512, sys_rt_block512), BLOCK_DEF(1024, HEAP_SYS_RT_COUNT1024, sys_rt_block1024), }; /* Heap blocks for modules */ -static SHARED_DATA struct block_hdr mod_block16[HEAP_RT_COUNT16]; -static SHARED_DATA struct block_hdr mod_block32[HEAP_RT_COUNT32]; -static SHARED_DATA struct block_hdr mod_block64[HEAP_RT_COUNT64]; -static SHARED_DATA struct block_hdr mod_block128[HEAP_RT_COUNT128]; -static SHARED_DATA struct block_hdr mod_block256[HEAP_RT_COUNT256]; -static SHARED_DATA struct block_hdr mod_block512[HEAP_RT_COUNT512]; -static SHARED_DATA struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; -static SHARED_DATA struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; -static SHARED_DATA struct block_hdr mod_block4096[HEAP_RT_COUNT4096]; +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; +static struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; +static struct block_hdr mod_block4096[HEAP_RT_COUNT4096]; /* Heap memory map for modules */ -static SHARED_DATA struct block_map rt_heap_map[] = { +static struct block_map rt_heap_map[] = { BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), @@ -49,14 +49,14 @@ static SHARED_DATA struct block_map rt_heap_map[] = { }; /* Heap blocks for buffers */ -static SHARED_DATA struct block_hdr buf_block[HEAP_BUFFER_COUNT]; +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; /* Heap memory map for buffers */ -static SHARED_DATA struct block_map buf_heap_map[] = { +static struct block_map buf_heap_map[] = { BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), }; -static SHARED_DATA struct mm memmap = { +static struct mm memmap = { .system[0] = { .heap = HEAP_SYSTEM_BASE, .size = HEAP_SYSTEM_SIZE, diff --git a/src/platform/mt8186/platform.c b/src/platform/mt8186/platform.c index e08766eba70d..7d708750f8f0 100644 --- a/src/platform/mt8186/platform.c +++ b/src/platform/mt8186/platform.c @@ -121,7 +121,7 @@ const struct ext_man_windows xsram_window } }; -static SHARED_DATA struct timer timer_shared = { +static struct timer timer_shared = { .id = OSTIMER0, .irq = MTK_DSP_IRQ_OSTIMER32, }; diff --git a/src/platform/mt8188/include/platform/lib/memory.h b/src/platform/mt8188/include/platform/lib/memory.h index 305e4c917846..17343e78ef76 100644 --- a/src/platform/mt8188/include/platform/lib/memory.h +++ b/src/platform/mt8188/include/platform/lib/memory.h @@ -39,7 +39,7 @@ #define EXT_MANIFEST_ELF_SIZE (SRAM_BASE + SRAM_SIZE - EXT_MANIFEST_ELF_BASE) /* - * The Memory Layout on MT8186 are organised like this :- + * The Memory Layout on MT8188 are organised like this :- * * +--------------------------------------------------------------------------+ * | Offset | Region | Size | @@ -184,12 +184,6 @@ struct sof; -/** - * \brief Data shared between different cores. - * Does nothing, since mt8186 doesn't support SMP. - */ -#define SHARED_DATA - void platform_init_memmap(struct sof *sof); #define uncache_to_cache(address) address @@ -200,9 +194,8 @@ void platform_init_memmap(struct sof *sof); /** * \brief Function for keeping shared data synchronized. * It's used after usage of data shared by different cores. - * Such data is either statically marked with SHARED_DATA - * or dynamically allocated with SOF_MEM_FLAG_SHARED flag. - * Does nothing, since mt8186 doesn't support SMP. + * Such data is dynamically allocated with SOF_MEM_FLAG_SHARED + * flag. Does nothing, since mt8188 doesn't support SMP. */ static inline void *platform_rfree_prepare(void *ptr) diff --git a/src/platform/mt8188/lib/clk.c b/src/platform/mt8188/lib/clk.c index bd97dad069a4..7a179128c1fc 100644 --- a/src/platform/mt8188/lib/clk.c +++ b/src/platform/mt8188/lib/clk.c @@ -32,7 +32,7 @@ const struct freq_table platform_cpu_freq[] = { STATIC_ASSERT(ARRAY_SIZE(platform_cpu_freq) == NUM_CPU_FREQ, invalid_number_of_cpu_frequencies); -static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS]; +static struct clock_info platform_clocks_info[NUM_CLOCKS]; static void clk_dsppll_enable(uint32_t value) { diff --git a/src/platform/mt8188/lib/dai.c b/src/platform/mt8188/lib/dai.c index d721bd4c1d39..53b30146a2fd 100644 --- a/src/platform/mt8188/lib/dai.c +++ b/src/platform/mt8188/lib/dai.c @@ -23,7 +23,7 @@ static int afe_dai_handshake[MT8188_DAI_NUM] = { AFE_HANDSHAKE(MT8188_AFE_IO_ETDM2_IN, MT8188_IRQ_22, MT8188_MEMIF_UL5), }; -static SHARED_DATA struct dai afe_dai[MT8188_DAI_NUM]; +static struct dai afe_dai[MT8188_DAI_NUM]; const struct dai_type_info dti[] = { { diff --git a/src/platform/mt8188/lib/dma.c b/src/platform/mt8188/lib/dma.c index aa377133b730..51bcb18a16ef 100644 --- a/src/platform/mt8188/lib/dma.c +++ b/src/platform/mt8188/lib/dma.c @@ -19,7 +19,7 @@ extern const struct dma_ops dummy_dma_ops; -static SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = { +static struct dma dma[PLATFORM_NUM_DMACS] = { { .plat_data = { .id = DMA_ID_HOST, diff --git a/src/platform/mt8188/lib/memory.c b/src/platform/mt8188/lib/memory.c index 5ef0828ffc6c..6475b01e48ad 100644 --- a/src/platform/mt8188/lib/memory.c +++ b/src/platform/mt8188/lib/memory.c @@ -13,30 +13,30 @@ #include /* Heap blocks for system runtime */ -static SHARED_DATA struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; -static SHARED_DATA struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; -static SHARED_DATA struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; +static struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; +static struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; +static struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; /* Heap memory for system runtime */ -static SHARED_DATA struct block_map sys_rt_heap_map[] = { +static struct block_map sys_rt_heap_map[] = { BLOCK_DEF(64, HEAP_SYS_RT_COUNT64, sys_rt_block64), BLOCK_DEF(512, HEAP_SYS_RT_COUNT512, sys_rt_block512), BLOCK_DEF(1024, HEAP_SYS_RT_COUNT1024, sys_rt_block1024), }; /* Heap blocks for modules */ -static SHARED_DATA struct block_hdr mod_block16[HEAP_RT_COUNT16]; -static SHARED_DATA struct block_hdr mod_block32[HEAP_RT_COUNT32]; -static SHARED_DATA struct block_hdr mod_block64[HEAP_RT_COUNT64]; -static SHARED_DATA struct block_hdr mod_block128[HEAP_RT_COUNT128]; -static SHARED_DATA struct block_hdr mod_block256[HEAP_RT_COUNT256]; -static SHARED_DATA struct block_hdr mod_block512[HEAP_RT_COUNT512]; -static SHARED_DATA struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; -static SHARED_DATA struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; -static SHARED_DATA struct block_hdr mod_block4096[HEAP_RT_COUNT4096]; +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; +static struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; +static struct block_hdr mod_block4096[HEAP_RT_COUNT4096]; /* Heap memory map for modules */ -static SHARED_DATA struct block_map rt_heap_map[] = { +static struct block_map rt_heap_map[] = { BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), @@ -49,14 +49,14 @@ static SHARED_DATA struct block_map rt_heap_map[] = { }; /* Heap blocks for buffers */ -static SHARED_DATA struct block_hdr buf_block[HEAP_BUFFER_COUNT]; +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; /* Heap memory map for buffers */ -static SHARED_DATA struct block_map buf_heap_map[] = { +static struct block_map buf_heap_map[] = { BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), }; -static SHARED_DATA struct mm memmap = { +static struct mm memmap = { .system[0] = { .heap = HEAP_SYSTEM_BASE, .size = HEAP_SYSTEM_SIZE, diff --git a/src/platform/mt8188/platform.c b/src/platform/mt8188/platform.c index d3433a3b46c8..babedcba3ac6 100644 --- a/src/platform/mt8188/platform.c +++ b/src/platform/mt8188/platform.c @@ -121,7 +121,7 @@ const struct ext_man_windows xsram_window } }; -static SHARED_DATA struct timer timer_shared = { +static struct timer timer_shared = { .id = OSTIMER0, .irq = MTK_DSP_IRQ_OSTIMER32, }; diff --git a/src/platform/mt8195/include/platform/lib/memory.h b/src/platform/mt8195/include/platform/lib/memory.h index 7a93d36d1b2a..75b8b3348e04 100644 --- a/src/platform/mt8195/include/platform/lib/memory.h +++ b/src/platform/mt8195/include/platform/lib/memory.h @@ -175,12 +175,6 @@ struct sof; -/** - * \brief Data shared between different cores. - * Does nothing, since mt8195 doesn't support SMP. - */ -#define SHARED_DATA - void platform_init_memmap(struct sof *sof); #define uncache_to_cache(address) address @@ -191,9 +185,8 @@ void platform_init_memmap(struct sof *sof); /** * \brief Function for keeping shared data synchronized. * It's used after usage of data shared by different cores. - * Such data is either statically marked with SHARED_DATA - * or dynamically allocated with SOF_MEM_FLAG_SHARED flag. - * Does nothing, since mt8195 doesn't support SMP. + * Such data is dynamically allocated with SOF_MEM_FLAG_SHARED + * flag. Does nothing, since mt8195 doesn't support SMP. */ static inline void *platform_rfree_prepare(void *ptr) diff --git a/src/platform/mt8195/lib/clk.c b/src/platform/mt8195/lib/clk.c index 894396ab4855..6fc89418650e 100644 --- a/src/platform/mt8195/lib/clk.c +++ b/src/platform/mt8195/lib/clk.c @@ -41,7 +41,7 @@ const uint32_t cpu_freq_enc[] = { STATIC_ASSERT(ARRAY_SIZE(platform_cpu_freq) == NUM_CPU_FREQ, invalid_number_of_cpu_frequencies); -static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS]; +static struct clock_info platform_clocks_info[NUM_CLOCKS]; static inline void clk_setl(uint32_t addr, uint32_t val) { diff --git a/src/platform/mt8195/lib/dai.c b/src/platform/mt8195/lib/dai.c index c385331489a6..e2e291e19f6e 100644 --- a/src/platform/mt8195/lib/dai.c +++ b/src/platform/mt8195/lib/dai.c @@ -23,7 +23,7 @@ static int afe_dai_handshake[MT8195_DAI_NUM] = { AFE_HANDSHAKE(MT8195_AFE_IO_ETDM2_IN, MT8195_IRQ_22, MT8195_MEMIF_UL5), }; -static SHARED_DATA struct dai afe_dai[MT8195_DAI_NUM]; +static struct dai afe_dai[MT8195_DAI_NUM]; const struct dai_type_info dti[] = { { diff --git a/src/platform/mt8195/lib/dma.c b/src/platform/mt8195/lib/dma.c index 7a9719e8a30c..89ee43af7eac 100644 --- a/src/platform/mt8195/lib/dma.c +++ b/src/platform/mt8195/lib/dma.c @@ -18,7 +18,7 @@ extern struct dma_ops dummy_dma_ops; -static SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = { +static struct dma dma[PLATFORM_NUM_DMACS] = { { .plat_data = { .id = DMA_ID_HOST, diff --git a/src/platform/mt8195/lib/memory.c b/src/platform/mt8195/lib/memory.c index c452a0520cc7..0fbfb0f5b3d1 100644 --- a/src/platform/mt8195/lib/memory.c +++ b/src/platform/mt8195/lib/memory.c @@ -12,30 +12,30 @@ #include /* Heap blocks for system runtime */ -static SHARED_DATA struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; -static SHARED_DATA struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; -static SHARED_DATA struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; +static struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; +static struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; +static struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; /* Heap memory for system runtime */ -static SHARED_DATA struct block_map sys_rt_heap_map[] = { +static struct block_map sys_rt_heap_map[] = { BLOCK_DEF(64, HEAP_SYS_RT_COUNT64, sys_rt_block64), BLOCK_DEF(512, HEAP_SYS_RT_COUNT512, sys_rt_block512), BLOCK_DEF(1024, HEAP_SYS_RT_COUNT1024, sys_rt_block1024), }; /* Heap blocks for modules */ -static SHARED_DATA struct block_hdr mod_block16[HEAP_RT_COUNT16]; -static SHARED_DATA struct block_hdr mod_block32[HEAP_RT_COUNT32]; -static SHARED_DATA struct block_hdr mod_block64[HEAP_RT_COUNT64]; -static SHARED_DATA struct block_hdr mod_block128[HEAP_RT_COUNT128]; -static SHARED_DATA struct block_hdr mod_block256[HEAP_RT_COUNT256]; -static SHARED_DATA struct block_hdr mod_block512[HEAP_RT_COUNT512]; -static SHARED_DATA struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; -static SHARED_DATA struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; -static SHARED_DATA struct block_hdr mod_block4096[HEAP_RT_COUNT4096]; +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; +static struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; +static struct block_hdr mod_block4096[HEAP_RT_COUNT4096]; /* Heap memory map for modules */ -static SHARED_DATA struct block_map rt_heap_map[] = { +static struct block_map rt_heap_map[] = { BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), @@ -48,14 +48,14 @@ static SHARED_DATA struct block_map rt_heap_map[] = { }; /* Heap blocks for buffers */ -static SHARED_DATA struct block_hdr buf_block[HEAP_BUFFER_COUNT]; +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; /* Heap memory map for buffers */ -static SHARED_DATA struct block_map buf_heap_map[] = { +static struct block_map buf_heap_map[] = { BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), }; -static SHARED_DATA struct mm memmap = { +static struct mm memmap = { .system[0] = { .heap = HEAP_SYSTEM_BASE, .size = HEAP_SYSTEM_SIZE, diff --git a/src/platform/mt8195/platform.c b/src/platform/mt8195/platform.c index 6a08580ad043..c1e59049b57a 100644 --- a/src/platform/mt8195/platform.c +++ b/src/platform/mt8195/platform.c @@ -121,7 +121,7 @@ const struct ext_man_windows xsram_window } }; -static SHARED_DATA struct timer timer_shared = { +static struct timer timer_shared = { .id = OSTIMER0, .irq = LX_ADSP_TIMTER_IRQ0_B, }; diff --git a/src/platform/mt8196/include/platform/lib/memory.h b/src/platform/mt8196/include/platform/lib/memory.h index b849fe09cb4f..41536d2ace4b 100644 --- a/src/platform/mt8196/include/platform/lib/memory.h +++ b/src/platform/mt8196/include/platform/lib/memory.h @@ -38,7 +38,7 @@ #define EXT_MANIFEST_ELF_SIZE (SRAM_BASE + SRAM_SIZE - EXT_MANIFEST_ELF_BASE) /* - * The Memory Layout on MT8189 are organised like this :- + * The Memory Layout on MT8196 are organised like this :- * * +--------------------------------------------------------------------------+ * | Offset | Region | Size | @@ -183,12 +183,6 @@ struct sof; -/** - * \brief Data shared between different cores. - * Does nothing, since mt8186 doesn't support SMP. - */ -#define SHARED_DATA - void platform_init_memmap(struct sof *sof); #define uncache_to_cache(address) address @@ -199,9 +193,8 @@ void platform_init_memmap(struct sof *sof); /** * \brief Function for keeping shared data synchronized. * It's used after usage of data shared by different cores. - * Such data is either statically marked with SHARED_DATA - * or dynamically allocated with SOF_MEM_FLAG_SHARED flag. - * Does nothing, since mt8186 doesn't support SMP. + * Such data is dynamically allocated with SOF_MEM_FLAG_SHARED + * flag. Does nothing, since mt8196 doesn't support SMP. */ static inline void *platform_rfree_prepare(void *ptr) diff --git a/src/platform/mt8196/lib/clk.c b/src/platform/mt8196/lib/clk.c index ebf109a0c9fc..a860a04b0133 100644 --- a/src/platform/mt8196/lib/clk.c +++ b/src/platform/mt8196/lib/clk.c @@ -30,7 +30,7 @@ const struct freq_table platform_cpu_freq[] = { STATIC_ASSERT(ARRAY_SIZE(platform_cpu_freq) == NUM_CPU_FREQ, invalid_number_of_cpu_frequencies); -static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS]; +static struct clock_info platform_clocks_info[NUM_CLOCKS]; void platform_clock_init(struct sof *sof) { diff --git a/src/platform/mt8196/lib/dai.c b/src/platform/mt8196/lib/dai.c index 6f5300e6aa48..63a08e5eb095 100755 --- a/src/platform/mt8196/lib/dai.c +++ b/src/platform/mt8196/lib/dai.c @@ -24,7 +24,7 @@ static int afe_dai_handshake[MT8196_DAI_NUM] = { AFE_HANDSHAKE(MT8196_DAI_AP_DMIC_CH34, MT8196_IRQ_15, MT8196_MEMIF_UL2), }; -static SHARED_DATA struct dai afe_dai[MT8196_DAI_NUM]; +static struct dai afe_dai[MT8196_DAI_NUM]; const struct dai_type_info dti[] = { { diff --git a/src/platform/mt8196/lib/dma.c b/src/platform/mt8196/lib/dma.c index 0cc4e1043a26..fef728fc87ea 100644 --- a/src/platform/mt8196/lib/dma.c +++ b/src/platform/mt8196/lib/dma.c @@ -18,7 +18,7 @@ extern const struct dma_ops dummy_dma_ops; -static SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = { +static struct dma dma[PLATFORM_NUM_DMACS] = { { .plat_data = { .id = DMA_ID_HOST, diff --git a/src/platform/mt8196/lib/memory.c b/src/platform/mt8196/lib/memory.c index 7445f1713830..c46956ed4946 100644 --- a/src/platform/mt8196/lib/memory.c +++ b/src/platform/mt8196/lib/memory.c @@ -12,30 +12,30 @@ #include /* Heap blocks for system runtime */ -static SHARED_DATA struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; -static SHARED_DATA struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; -static SHARED_DATA struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; +static struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; +static struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; +static struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; /* Heap memory for system runtime */ -static SHARED_DATA struct block_map sys_rt_heap_map[] = { +static struct block_map sys_rt_heap_map[] = { BLOCK_DEF(64, HEAP_SYS_RT_COUNT64, sys_rt_block64), BLOCK_DEF(512, HEAP_SYS_RT_COUNT512, sys_rt_block512), BLOCK_DEF(1024, HEAP_SYS_RT_COUNT1024, sys_rt_block1024), }; /* Heap blocks for modules */ -static SHARED_DATA struct block_hdr mod_block16[HEAP_RT_COUNT16]; -static SHARED_DATA struct block_hdr mod_block32[HEAP_RT_COUNT32]; -static SHARED_DATA struct block_hdr mod_block64[HEAP_RT_COUNT64]; -static SHARED_DATA struct block_hdr mod_block128[HEAP_RT_COUNT128]; -static SHARED_DATA struct block_hdr mod_block256[HEAP_RT_COUNT256]; -static SHARED_DATA struct block_hdr mod_block512[HEAP_RT_COUNT512]; -static SHARED_DATA struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; -static SHARED_DATA struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; -static SHARED_DATA struct block_hdr mod_block4096[HEAP_RT_COUNT4096]; +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; +static struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; +static struct block_hdr mod_block4096[HEAP_RT_COUNT4096]; /* Heap memory map for modules */ -static SHARED_DATA struct block_map rt_heap_map[] = { +static struct block_map rt_heap_map[] = { BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), @@ -48,14 +48,14 @@ static SHARED_DATA struct block_map rt_heap_map[] = { }; /* Heap blocks for buffers */ -static SHARED_DATA struct block_hdr buf_block[HEAP_BUFFER_COUNT]; +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; /* Heap memory map for buffers */ -static SHARED_DATA struct block_map buf_heap_map[] = { +static struct block_map buf_heap_map[] = { BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), }; -static SHARED_DATA struct mm memmap = { +static struct mm memmap = { .system[0] = { .heap = HEAP_SYSTEM_BASE, .size = HEAP_SYSTEM_SIZE, diff --git a/src/platform/mt8196/platform.c b/src/platform/mt8196/platform.c index c093e7b003ef..8cb188ce2210 100644 --- a/src/platform/mt8196/platform.c +++ b/src/platform/mt8196/platform.c @@ -120,7 +120,7 @@ const struct ext_man_windows xsram_window } }; -static SHARED_DATA struct timer timer_shared = { +static struct timer timer_shared = { .id = OSTIMER0, .irq = MTK_DSP_IRQ_OSTIMER32_C0, }; diff --git a/src/platform/mt8365/include/platform/lib/memory.h b/src/platform/mt8365/include/platform/lib/memory.h index 75965466ae95..93bf268c93a2 100644 --- a/src/platform/mt8365/include/platform/lib/memory.h +++ b/src/platform/mt8365/include/platform/lib/memory.h @@ -198,12 +198,6 @@ struct sof; -/** - * \brief Data shared between different cores. - * Does nothing, since mt8195 doesn't support SMP. - */ -#define SHARED_DATA - void platform_init_memmap(struct sof *sof); #define uncache_to_cache(address) address @@ -214,9 +208,8 @@ void platform_init_memmap(struct sof *sof); /** * \brief Function for keeping shared data synchronized. * It's used after usage of data shared by different cores. - * Such data is either statically marked with SHARED_DATA - * or dynamically allocated with SOF_MEM_FLAG_SHARED flag. - * Does nothing, since mt8195 doesn't support SMP. + * Such data is dynamically allocated with SOF_MEM_FLAG_SHARED + * flag. Does nothing, since mt8195 doesn't support SMP. */ static inline void *platform_rfree_prepare(void *ptr) diff --git a/src/platform/mt8365/lib/clk.c b/src/platform/mt8365/lib/clk.c index 57bc821049fb..e685e1e2d4fc 100644 --- a/src/platform/mt8365/lib/clk.c +++ b/src/platform/mt8365/lib/clk.c @@ -41,7 +41,7 @@ const uint32_t cpu_freq_enc[] = { STATIC_ASSERT(ARRAY_SIZE(platform_cpu_freq) == NUM_CPU_FREQ, invalid_number_of_cpu_frequencies); -static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS]; +static struct clock_info platform_clocks_info[NUM_CLOCKS]; static inline void clk_setl(uint32_t addr, uint32_t val) { diff --git a/src/platform/mt8365/lib/dai.c b/src/platform/mt8365/lib/dai.c index 6700e3257ac2..522952996d75 100644 --- a/src/platform/mt8365/lib/dai.c +++ b/src/platform/mt8365/lib/dai.c @@ -37,7 +37,7 @@ static int afe_dai_handshake[MT8365_DAI_NUM] = { AFE_HANDSHAKE(MT8365_AFE_IO_DMIC, MT8365_AFE_IRQ_4, MT8365_MEMIF_VUL), }; -static SHARED_DATA struct dai afe_dai[MT8365_DAI_NUM]; +static struct dai afe_dai[MT8365_DAI_NUM]; const struct dai_type_info dti[] = { { diff --git a/src/platform/mt8365/lib/dma.c b/src/platform/mt8365/lib/dma.c index 9e6209790731..d80c81723676 100644 --- a/src/platform/mt8365/lib/dma.c +++ b/src/platform/mt8365/lib/dma.c @@ -18,7 +18,7 @@ extern const struct dma_ops dummy_dma_ops; -static SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = { +static struct dma dma[PLATFORM_NUM_DMACS] = { { .plat_data = { .id = DMA_ID_HOST, diff --git a/src/platform/mt8365/lib/memory.c b/src/platform/mt8365/lib/memory.c index 7ed1417dc1f2..e64eef957742 100644 --- a/src/platform/mt8365/lib/memory.c +++ b/src/platform/mt8365/lib/memory.c @@ -12,30 +12,30 @@ #include /* Heap blocks for system runtime */ -static SHARED_DATA struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; -static SHARED_DATA struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; -static SHARED_DATA struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; +static struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64]; +static struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512]; +static struct block_hdr sys_rt_block1024[HEAP_SYS_RT_COUNT1024]; /* Heap memory for system runtime */ -static SHARED_DATA struct block_map sys_rt_heap_map[] = { +static struct block_map sys_rt_heap_map[] = { BLOCK_DEF(64, HEAP_SYS_RT_COUNT64, sys_rt_block64), BLOCK_DEF(512, HEAP_SYS_RT_COUNT512, sys_rt_block512), BLOCK_DEF(1024, HEAP_SYS_RT_COUNT1024, sys_rt_block1024), }; /* Heap blocks for modules */ -static SHARED_DATA struct block_hdr mod_block16[HEAP_RT_COUNT16]; -static SHARED_DATA struct block_hdr mod_block32[HEAP_RT_COUNT32]; -static SHARED_DATA struct block_hdr mod_block64[HEAP_RT_COUNT64]; -static SHARED_DATA struct block_hdr mod_block128[HEAP_RT_COUNT128]; -static SHARED_DATA struct block_hdr mod_block256[HEAP_RT_COUNT256]; -static SHARED_DATA struct block_hdr mod_block512[HEAP_RT_COUNT512]; -static SHARED_DATA struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; -static SHARED_DATA struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; -static SHARED_DATA struct block_hdr mod_block4096[HEAP_RT_COUNT4096]; +static struct block_hdr mod_block16[HEAP_RT_COUNT16]; +static struct block_hdr mod_block32[HEAP_RT_COUNT32]; +static struct block_hdr mod_block64[HEAP_RT_COUNT64]; +static struct block_hdr mod_block128[HEAP_RT_COUNT128]; +static struct block_hdr mod_block256[HEAP_RT_COUNT256]; +static struct block_hdr mod_block512[HEAP_RT_COUNT512]; +static struct block_hdr mod_block1024[HEAP_RT_COUNT1024]; +static struct block_hdr mod_block2048[HEAP_RT_COUNT2048]; +static struct block_hdr mod_block4096[HEAP_RT_COUNT4096]; /* Heap memory map for modules */ -static SHARED_DATA struct block_map rt_heap_map[] = { +static struct block_map rt_heap_map[] = { BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16), BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32), BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64), @@ -48,14 +48,14 @@ static SHARED_DATA struct block_map rt_heap_map[] = { }; /* Heap blocks for buffers */ -static SHARED_DATA struct block_hdr buf_block[HEAP_BUFFER_COUNT]; +static struct block_hdr buf_block[HEAP_BUFFER_COUNT]; /* Heap memory map for buffers */ -static SHARED_DATA struct block_map buf_heap_map[] = { +static struct block_map buf_heap_map[] = { BLOCK_DEF(HEAP_BUFFER_BLOCK_SIZE, HEAP_BUFFER_COUNT, buf_block), }; -static SHARED_DATA struct mm memmap = { +static struct mm memmap = { .system[0] = { .heap = HEAP_SYSTEM_BASE, .size = HEAP_SYSTEM_SIZE, diff --git a/src/platform/mt8365/platform.c b/src/platform/mt8365/platform.c index 5ae6378c5eb5..93e617cdebbf 100644 --- a/src/platform/mt8365/platform.c +++ b/src/platform/mt8365/platform.c @@ -120,7 +120,7 @@ const struct ext_man_windows xsram_window } }; -static SHARED_DATA struct timer timer_shared = { +static struct timer timer_shared = { .id = OSTIMER0, .irq = SYSTICK_TIMER_IRQ, }; diff --git a/src/platform/mtk/include/platform/lib/memory.h b/src/platform/mtk/include/platform/lib/memory.h index 1e3acbee6912..b5ce4de855ab 100644 --- a/src/platform/mtk/include/platform/lib/memory.h +++ b/src/platform/mtk/include/platform/lib/memory.h @@ -23,8 +23,6 @@ BUILD_ASSERT(PLATFORM_DCACHE_ALIGN == XCHAL_DCACHE_LINESIZE); #define PLATFORM_HEAP_RUNTIME 1 #define PLATFORM_HEAP_BUFFER 1 -#define SHARED_DATA /* no special section attribute needed */ - /* Mailbox window addresses for the rimage extended manifest. The * struct is optimized out in generated code, it's just here to be a * little clearer than the pages of #defines used traditionally. diff --git a/src/platform/posix/include/platform/lib/memory.h b/src/platform/posix/include/platform/lib/memory.h index f2f6e567223b..e24c48aa40b3 100644 --- a/src/platform/posix/include/platform/lib/memory.h +++ b/src/platform/posix/include/platform/lib/memory.h @@ -47,6 +47,4 @@ extern uint32_t posix_trace[]; #define host_to_local(addr) (addr) -#define SHARED_DATA /**/ - #endif /* PLATFORM_HOST_PLATFORM_MEMORY_H */ diff --git a/src/platform/qemu_xtensa/include/platform/lib/memory.h b/src/platform/qemu_xtensa/include/platform/lib/memory.h index 7c8f9da9c1c1..57f001de169b 100644 --- a/src/platform/qemu_xtensa/include/platform/lib/memory.h +++ b/src/platform/qemu_xtensa/include/platform/lib/memory.h @@ -10,6 +10,5 @@ #define PLATFORM_DCACHE_ALIGN sizeof(void *) #define HOST_PAGE_SIZE 4096 -#define SHARED_DATA #endif /* __PLATFORM_LIB_MEMORY_H__ */ diff --git a/src/samples/audio/detect_test.c b/src/samples/audio/detect_test.c index 7979d7db3d6c..2ce5f01f3999 100644 --- a/src/samples/audio/detect_test.c +++ b/src/samples/audio/detect_test.c @@ -1107,7 +1107,7 @@ static const struct comp_driver comp_keyword = { }, }; -static SHARED_DATA struct comp_driver_info comp_keyword_info = { +static struct comp_driver_info comp_keyword_info = { .drv = &comp_keyword, }; diff --git a/src/samples/audio/smart_amp_test_ipc3.c b/src/samples/audio/smart_amp_test_ipc3.c index 1172fb3c0716..da1f293eb55a 100644 --- a/src/samples/audio/smart_amp_test_ipc3.c +++ b/src/samples/audio/smart_amp_test_ipc3.c @@ -559,7 +559,7 @@ static const struct comp_driver comp_smart_amp = { }, }; -static SHARED_DATA struct comp_driver_info comp_smart_amp_info = { +static struct comp_driver_info comp_smart_amp_info = { .drv = &comp_smart_amp, }; diff --git a/zephyr/lib/clk.c b/zephyr/lib/clk.c index 0cc9006e3a11..06cc5979753e 100644 --- a/zephyr/lib/clk.c +++ b/zephyr/lib/clk.c @@ -13,7 +13,7 @@ #include #include -static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS]; +static struct clock_info platform_clocks_info[NUM_CLOCKS]; static int select_cpu_freq(int clock, int hz) { diff --git a/zephyr/lib/dma.c b/zephyr/lib/dma.c index 1e28d7215026..a478d5069a09 100644 --- a/zephyr/lib/dma.c +++ b/zephyr/lib/dma.c @@ -21,7 +21,7 @@ #define DW_DMA_BUFFER_PERIOD_COUNT 0x4 #define HDA_DMA_BUFFER_PERIOD_COUNT 4 -APP_SYSUSER_DATA SHARED_DATA struct sof_dma dma[] = { +APP_SYSUSER_DATA struct sof_dma dma[] = { #if DT_NODE_HAS_STATUS(DT_NODELABEL(lpgpdma0), okay) { /* Low Power GP DMAC 0 */ .plat_data = { From 22f35a4b49f80451772d2536db948560afbe70d4 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Tue, 25 Aug 2026 14:59:02 +0200 Subject: [PATCH 2/2] global: remove unused memory.h headers Compilation verified, that memory.h are no longer needed after removal of SHARED_DATA. Signed-off-by: Guennadi Liakhovetski --- src/audio/base_fw.c | 1 - src/audio/component.c | 1 - src/audio/dai-legacy.c | 1 - src/audio/dai-zephyr.c | 1 - src/audio/google/google_hotword_detect.c | 1 - src/audio/host-legacy.c | 1 - src/audio/host-zephyr.c | 1 - src/audio/kpb.c | 1 - src/audio/selector/selector.c | 1 - src/audio/tone/tone-ipc3.c | 1 - src/audio/tone/tone-ipc4.c | 1 - src/audio/tone/tone.c | 1 - src/audio/tone/tone.h | 1 - 13 files changed, 13 deletions(-) diff --git a/src/audio/base_fw.c b/src/audio/base_fw.c index 88d3a54adcee..1ad9580d74b5 100644 --- a/src/audio/base_fw.c +++ b/src/audio/base_fw.c @@ -4,7 +4,6 @@ // #include -#include /* likely unneeded */ #include #include #include diff --git a/src/audio/component.c b/src/audio/component.c index e2c38a9c62da..af0b9c278368 100644 --- a/src/audio/component.c +++ b/src/audio/component.c @@ -13,7 +13,6 @@ #include #include #include -#include /* likely unneeded */ #include #include #include diff --git a/src/audio/dai-legacy.c b/src/audio/dai-legacy.c index d16aec40efd8..49fb8e011ffd 100644 --- a/src/audio/dai-legacy.c +++ b/src/audio/dai-legacy.c @@ -19,7 +19,6 @@ #include #include #include -#include /* likely unneeded */ #include #include #include diff --git a/src/audio/dai-zephyr.c b/src/audio/dai-zephyr.c index 7bb53c88e178..9f4e5dc57295 100644 --- a/src/audio/dai-zephyr.c +++ b/src/audio/dai-zephyr.c @@ -19,7 +19,6 @@ #include #include #include -#include /* likely unneeded */ #include #include #include diff --git a/src/audio/google/google_hotword_detect.c b/src/audio/google/google_hotword_detect.c index f8f7c22467be..d67a97a5823f 100644 --- a/src/audio/google/google_hotword_detect.c +++ b/src/audio/google/google_hotword_detect.c @@ -15,7 +15,6 @@ #include #include #include -#include /* likely unneeded */ #include #include #include diff --git a/src/audio/host-legacy.c b/src/audio/host-legacy.c index d56319c0184d..d17da437ffb4 100644 --- a/src/audio/host-legacy.c +++ b/src/audio/host-legacy.c @@ -17,7 +17,6 @@ #include #include #include -#include /* likely unneeded */ #include #include #include diff --git a/src/audio/host-zephyr.c b/src/audio/host-zephyr.c index f2bfae946d8d..5f23ff405857 100644 --- a/src/audio/host-zephyr.c +++ b/src/audio/host-zephyr.c @@ -17,7 +17,6 @@ #include #include #include -#include /* likely unneeded */ #include #include #include diff --git a/src/audio/kpb.c b/src/audio/kpb.c index 40353ff71e20..4e5049919baf 100644 --- a/src/audio/kpb.c +++ b/src/audio/kpb.c @@ -26,7 +26,6 @@ #include #include #include -#include /* likely unneeded */ #include #include #include diff --git a/src/audio/selector/selector.c b/src/audio/selector/selector.c index 422e08f69603..bc48f99b5126 100644 --- a/src/audio/selector/selector.c +++ b/src/audio/selector/selector.c @@ -22,7 +22,6 @@ #include #include #include -#include /* likely unneeded */ #include #include #include diff --git a/src/audio/tone/tone-ipc3.c b/src/audio/tone/tone-ipc3.c index b2ebb3209571..75017fe3910f 100644 --- a/src/audio/tone/tone-ipc3.c +++ b/src/audio/tone/tone-ipc3.c @@ -16,7 +16,6 @@ #include #include #include -#include /* likely unneeded */ #include #include #include diff --git a/src/audio/tone/tone-ipc4.c b/src/audio/tone/tone-ipc4.c index db2497e8aa40..a54ed0b2b862 100644 --- a/src/audio/tone/tone-ipc4.c +++ b/src/audio/tone/tone-ipc4.c @@ -17,7 +17,6 @@ #include #include #include -#include /* likely unneeded */ #include #include #include diff --git a/src/audio/tone/tone.c b/src/audio/tone/tone.c index 0941d7edcb69..dac32a3c187e 100644 --- a/src/audio/tone/tone.c +++ b/src/audio/tone/tone.c @@ -17,7 +17,6 @@ #include #include #include -#include /* likely unneeded */ #include #include #include diff --git a/src/audio/tone/tone.h b/src/audio/tone/tone.h index 33c0862ef19c..1a3978b710b5 100644 --- a/src/audio/tone/tone.h +++ b/src/audio/tone/tone.h @@ -14,7 +14,6 @@ #include #include #include -#include /* likely unneeded */ #include #include #include