Skip to content

idc: call cache function z_xtensa_cache_flush directly #7341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nashif wants to merge 1 commit into from
Closed

idc: call cache function z_xtensa_cache_flush directly #7341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/idc/zephyr_idc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
#include <rtos/alloc.h>
#include <rtos/spinlock.h>
#include <ipc/topology.h>
#if defined(CONFIG_ARCH_XTENSA) && !defined(CONFIG_KERNEL_COHERENCE)
#include <zephyr/arch/xtensa/cache.h>
#endif

@kv2019i kv2019i Mar 29, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, if these are not defined, wouldn't the build anyways fail when z_xtensa_cache_flush() is not defined?

@nashif nashif Apr 6, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do not remember why I did this, afaik this is the same in zephyr/lib/alloc.c

@lgirdwood lgirdwood Apr 14, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kv2019i do we need to fix zephyr/lib/alloc.c or is this correct ?


/*
* Inter-CPU communication is only used in
Expand Down Expand Up @@ -62,7 +65,7 @@ static void idc_handler(struct k_p4wq_work *work)
int payload = -1;
k_spinlock_key_t key;

SOC_DCACHE_INVALIDATE(msg, sizeof(*msg));
z_xtensa_cache_flush(msg, sizeof(*msg));

if (msg->size == sizeof(int)) {
const int idc_handler_memcpy_err __unused =
Expand Down Expand Up @@ -122,13 +125,13 @@ int idc_send_msg(struct idc_msg *msg, uint32_t mode)
msg->payload, msg->size);
assert(!idc_send_memcpy_err);

SOC_DCACHE_FLUSH(payload->data, MIN(sizeof(payload->data), msg->size));
z_xtensa_cache_flush(payload->data, MIN(sizeof(payload->data), msg->size));
}

/* Temporarily store sender core ID */
msg_cp->core = cpu_get_id();

SOC_DCACHE_FLUSH(msg_cp, sizeof(*msg_cp));
z_xtensa_cache_flush(msg_cp, sizeof(*msg_cp));
k_p4wq_submit(q_zephyr_idc + target_cpu, work);

switch (mode) {
Expand Down