Skip to content

Commit

Permalink
host: do not set L1 exit if interrupt mode selected + update zephyr west
Browse files Browse the repository at this point in the history
Update zephyr to c31e68329

Signed-off-by: Adrian Bonislawski <adrian.bonislawski@intel.com>
  • Loading branch information
abonislawski committed Jun 29, 2023
1 parent 30f4543 commit 9daaddc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
8 changes: 6 additions & 2 deletions src/audio/host-zephyr.c
Original file line number Diff line number Diff line change
Expand Up @@ -457,10 +457,10 @@ static int host_copy_normal(struct host_data *hd, struct comp_dev *dev, copy_cal
copy_bytes = host_get_copy_bytes_normal(hd, dev);
if (!copy_bytes)
return 0;

#if !CONFIG_DMA_INTEL_ADSP_HDA_TIMING_L1_EXIT
/* Register Host DMA usage */
pm_runtime_get(PM_RUNTIME_HOST_DMA_L1, 0);

#endif
cb(dev, copy_bytes);

hd->partial_size += copy_bytes;
Expand Down Expand Up @@ -564,10 +564,12 @@ int host_zephyr_trigger(struct host_data *hd, struct comp_dev *dev, int cmd)
if (ret < 0)
comp_err(dev, "host_trigger(): dma_start() failed, ret = %u",
ret);
#if !CONFIG_DMA_INTEL_ADSP_HDA_TIMING_L1_EXIT
/* Register common L1 exit for all channels */
ret = notifier_register(NULL, scheduler_get_data(SOF_SCHEDULE_LL_TIMER),
NOTIFIER_ID_LL_POST_RUN, hda_dma_l1_exit_notify,
NOTIFIER_FLAG_AGGREGATE);
#endif
break;
case COMP_TRIGGER_STOP:
case COMP_TRIGGER_XRUN:
Expand All @@ -576,9 +578,11 @@ int host_zephyr_trigger(struct host_data *hd, struct comp_dev *dev, int cmd)
if (ret < 0)
comp_err(dev, "host_trigger(): dma stop failed: %d",
ret);
#if !CONFIG_DMA_INTEL_ADSP_HDA_TIMING_L1_EXIT
/* Unregister L1 exit */
notifier_unregister(NULL, scheduler_get_data(SOF_SCHEDULE_LL_TIMER),
NOTIFIER_ID_LL_POST_RUN);
#endif
}

break;
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ manifest:

- name: zephyr
repo-path: zephyr
revision: 79b598daf229fe971a303389d5301ab31212deb8
revision: c31e683295ebd77789f6b4e95c68b073b53b0112
remote: thesofproject

# Import some projects listed in zephyr/west.yml@revision
Expand Down

0 comments on commit 9daaddc

Please sign in to comment.