Skip to content

Power management and other comments + constify ipc_buffer_new#4441

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

Merged
lgirdwood merged 4 commits into from
Jul 7, 2021
Merged

Power management and other comments + constify ipc_buffer_new #4441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
503740a
Add alternative, more reliable STATIC_ASSERT() disabled by default
marc-hb Jun 28, 2021
7a906f2
ipc_buffer_new: make buffer argument const
marc-hb Jun 28, 2021
2412748
zephyr/wrapper.c: add "temporary fix" comment to ipc_send_queued_msg()
marc-hb Jul 1, 2021
c48ddf6
pm_runtime.c: explain the opposition between "enable" and "active"
marc-hb Jul 1, 2021
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
2 changes: 1 addition & 1 deletion src/include/sof/audio/buffer.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ struct buffer_cb_free {

/* pipeline buffer creation and destruction */
struct comp_buffer *buffer_alloc(uint32_t size, uint32_t caps, uint32_t align);
struct comp_buffer *buffer_new(struct sof_ipc_buffer *desc);
struct comp_buffer *buffer_new(const struct sof_ipc_buffer *desc);

@lgirdwoodlgirdwoodJul 2, 2021

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.

We are probably missing other const usage wrt IPC too.

@marc-hbmarc-hbJul 2, 2021

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Probably, this one just came up when looking at your valgrind fixes.

int buffer_set_size(struct comp_buffer *buffer, uint32_t size);
void buffer_free(struct comp_buffer *buffer);
void buffer_zero(struct comp_buffer *buffer);
Expand Down
18 changes: 17 additions & 1 deletion src/include/sof/common.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,10 +119,26 @@
#define PP_NARG(...) (sizeof((unsigned int[]){0, ##__VA_ARGS__}) \
/ sizeof(unsigned int) - 1)

/* compile-time assertion */
/* Compile-time assertion.
*
* The first, typedef-based solution silently succeeds with variables,
* for instance STATIC_ASSERT(n == 42, always_succeeds) when 'n' is a
* variable in a function. The second, array-based solution is not
* fooled by variables but it increases the .bss size at the -O0
* optimization level (no difference with any real -O). As we're often
* short on space, use the typedef-based version by default. If you're
* afraid that some assertions are being fooled by variables then
* temporarily and locally switch to the second one.
*/
#if 1
#define STATIC_ASSERT(COND, MESSAGE) \
__attribute__((unused)) \
typedef char META_CONCAT(assertion_failed_, MESSAGE)[(COND) ? 1 : -1]
#else
#define STATIC_ASSERT(COND, MESSAGE) \
__attribute__((unused)) \
static char META_CONCAT(arr_assertion_failed_, MESSAGE)[(COND) ? 1 : -1]

@lyakhlyakhJul 5, 2021

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.

does it have to be static? And there's an additional space there

@marc-hbmarc-hbJul 5, 2021

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

does it have to be static?

Depends where you prefer to waste a few bytes per assertion at the -O0 level. I suspect the .bss is likely to have less performance impact.

And there's an additional space there

That was for aligning with the other one but not very useful, I can remove.

@marc-hbmarc-hbJul 5, 2021•
edited
Loading

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Depends where you prefer to waste a few bytes per assertion at the -O0 level. I suspect the .bss is likely to have less performance impact.

Actually: I didn't check whether gcc -O0 allocates unused local variables or not.

This is the reason this is disabled by default: it's very tedious and more importantly: unreliable to test every optimization level for every compiler.

#endif

/* Allows checking preprocessor symbols in compile-time.
* Returns true for config with value 1, false for undefined or any other value.
Expand Down
2 changes: 1 addition & 1 deletion src/include/sof/ipc/topology.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,7 +98,7 @@ int ipc_comp_free(struct ipc *ipc, uint32_t comp_id);
* @param buffer New IPC buffer descriptor.
* @return 0 on success or negative error.
*/
int ipc_buffer_new(struct ipc *ipc, struct sof_ipc_buffer *buffer);
int ipc_buffer_new(struct ipc *ipc, const struct sof_ipc_buffer *buffer);

/**
* \brief Free an IPC buffer.
Expand Down
4 changes: 2 additions & 2 deletions src/ipc/ipc3/helper.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -599,7 +599,7 @@ int ipc_pipeline_complete(struct ipc *ipc, uint32_t comp_id)
return ret;
}

int ipc_buffer_new(struct ipc *ipc, struct sof_ipc_buffer *desc)
int ipc_buffer_new(struct ipc *ipc, const struct sof_ipc_buffer *desc)
{
struct ipc_comp_dev *ibd;
struct comp_buffer *buffer;
Expand DownExpand Up@@ -874,7 +874,7 @@ int ipc_comp_free(struct ipc *ipc, uint32_t comp_id)
}

/* create a new component in the pipeline */
struct comp_buffer *buffer_new(struct sof_ipc_buffer *desc)
struct comp_buffer *buffer_new(const struct sof_ipc_buffer *desc)
{
struct comp_buffer *buffer;

Expand Down
20 changes: 20 additions & 0 deletions src/lib/pm_runtime.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,21 @@ void pm_runtime_init(struct sof *sof)

}

/* Warning: the terms in this API (enable, active,... ) apply sometimes
* to power _management_ and other times to _power_ which can be
* confusing. They are however consistent with
* https://www.kernel.org/doc/Documentation/power/runtime_pm.txt and the
* long tradition of double and triple negations in power management.
*/

/** Increase the usage counter of some PM context. In general this
* blocks low power state but there are exception(s), for instance the
* context for the PM_RUNTIME_HOST_DMA_L1 is reversed: usage blocks high
* power state.
*
* Warning: some (all?) platforms don't really implement any counter, in
* other words the "counter" is silently maxed at 1.
*/
void pm_runtime_get(enum pm_runtime_context context, uint32_t index)
{
tr_dbg(&pm_tr, "pm_runtime_get() context %d index %d", context, index);
Expand All@@ -58,6 +73,8 @@ void pm_runtime_get_sync(enum pm_runtime_context context, uint32_t index)
}
}

/** Decreases the usage counter of some PM context, see pm_runtime_get()
*/
void pm_runtime_put(enum pm_runtime_context context, uint32_t index)
{
tr_dbg(&pm_tr, "pm_runtime_put() context %d index %d", context, index);
Expand All@@ -81,6 +98,7 @@ void pm_runtime_put_sync(enum pm_runtime_context context, uint32_t index)
}
}

/** Enables power _management_. The management, not the power. */
void pm_runtime_enable(enum pm_runtime_context context, uint32_t index)
{
tr_dbg(&pm_tr, "pm_runtime_enable() context %d index %d", context,
Expand All@@ -93,6 +111,7 @@ void pm_runtime_enable(enum pm_runtime_context context, uint32_t index)
}
}

/** Disables power _management_. The management, not the power. */
void pm_runtime_disable(enum pm_runtime_context context, uint32_t index)
{
tr_dbg(&pm_tr, "pm_runtime_disable() context %d index %d", context,
Expand All@@ -105,6 +124,7 @@ void pm_runtime_disable(enum pm_runtime_context context, uint32_t index)
}
}

/** Is the _power_ active. The power, not its management. */
bool pm_runtime_is_active(enum pm_runtime_context context, uint32_t index)
{
tr_dbg(&pm_tr, "pm_runtime_is_active() context %d index %d", context,
Expand Down
1 change: 1 addition & 0 deletions zephyr/wrapper.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -537,6 +537,7 @@ int task_main_start(struct sof *sof)
/* init pipeline position offsets */
pipeline_posn_init(sof);

/* Temporary fix for issue #4356 */
(void)notifier_register(NULL, scheduler_get_data(SOF_SCHEDULE_LL_TIMER),
NOTIFIER_ID_LL_POST_RUN,
ipc_send_queued_callback, 0);
Expand Down