Skip to content

cAVS: pm_runtime: change to use bool flag to denote the DSP target state #3252

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
jajanusz merged 1 commit into from
Jul 30, 2020
Merged

cAVS: pm_runtime: change to use bool flag to denote the DSP target state #3252

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/platform/intel/cavs/include/cavs/lib/pm_runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ struct pm_runtime_data;

/** \brief cAVS specific runtime power management data. */
struct cavs_pm_runtime_data {
int dsp_d0_sref; /**< simple ref counter, accessed by core 0 only */
bool dsp_d0; /**< dsp target D0(true) or D0ix(false) */
int host_dma_l1_sref; /**< ref counter for Host DMA accesses */
uint32_t sleep_core_mask; /**< represents cores in waiti state */
};
Expand Down
9 changes: 4 additions & 5 deletions src/platform/intel/cavs/lib/pm_runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,14 @@ static inline void cavs_pm_runtime_enable_dsp(bool enable)
*/
irq_local_disable(flags);

enable ? --pprd->dsp_d0_sref : ++pprd->dsp_d0_sref;
pprd->dsp_d0 = !enable;

platform_shared_commit(prd, sizeof(*prd));

irq_local_enable(flags);

tr_info(&power_tr, "pm_runtime_enable_dsp dsp_d0_sref %d",
pprd->dsp_d0_sref);
pprd->dsp_d0);

platform_shared_commit(pprd, sizeof(*pprd));

Expand All @@ -114,7 +114,7 @@ static inline void cavs_pm_runtime_enable_dsp(bool enable)
if (!clk_info)
return;

if (pprd->dsp_d0_sref > 0) {
if (pprd->dsp_d0) {
if (clk_info->current_freq_idx == CPU_LPRO_FREQ_IDX)
report_dsp_r_state(r1_r_state);
else
Expand All @@ -129,12 +129,11 @@ static inline bool cavs_pm_runtime_is_active_dsp(void)
{
struct pm_runtime_data *prd = pm_runtime_data_get();
struct cavs_pm_runtime_data *pprd = prd->platform_data;
int is_active = pprd->dsp_d0_sref > 0;

platform_shared_commit(prd, sizeof(*prd));
platform_shared_commit(pprd, sizeof(*pprd));

return is_active;
return pprd->dsp_d0;
}

#if CONFIG_INTEL_SSP
Expand Down