Skip to content
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

[SOF2.9] backport fixes from Zephyr main #77

Merged
merged 4 commits into from
Mar 5, 2024
Merged

[SOF2.9] backport fixes from Zephyr main #77

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
6b32afd
drivers: dma: intel-adsp-hda: add delay to stop host dma
RanderWang Jan 3, 2024
3441525
drivers: dma: intel-adsp-hda: modify stop dma logic
kv2019i Feb 1, 2024
684fe0d
soc: xtensa: intel_adsp: restore bootctl with per-core state
kv2019i Feb 12, 2024
3f063f2
dai: intel: dmic: demote spurious LOG_ERR in dai_nhlt_get_clock_div()
marc-hb Jan 12, 2024
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
4 changes: 2 additions & 2 deletions drivers/dai/intel/dmic/dmic_nhlt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,12 @@ static int dai_nhlt_get_clock_div(const struct dai_intel_dmic *dmic, const int p

val = dai_dmic_read(dmic, dmic_base[pdm] +
FIR_CHANNEL_REGS_SIZE * dmic->dai_config_params.dai_index + FIR_CONFIG);
LOG_ERR("pdm = %d, FIR_CONFIG = 0x%08X", pdm, val);
LOG_INF("pdm = %d, FIR_CONFIG = 0x%08X", pdm, val);

p_mfir = FIELD_GET(FIR_CONFIG_FIR_DECIMATION, val) + 1;

rate_div = p_clkdiv * p_mcic * p_mfir;
LOG_ERR("dai_index = %d, rate_div = %d, p_clkdiv = %d, p_mcic = %d, p_mfir = %d",
LOG_INF("dai_index = %d, rate_div = %d, p_clkdiv = %d, p_mcic = %d, p_mfir = %d",
dmic->dai_config_params.dai_index, rate_div, p_clkdiv, p_mcic, p_mfir);

if (!rate_div) {
Expand Down
5 changes: 5 additions & 0 deletions drivers/dma/dma_intel_adsp_hda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,11 @@ int intel_adsp_hda_dma_stop(const struct device *dev, uint32_t channel)

intel_adsp_hda_disable(cfg->base, cfg->regblock_size, channel);

if (!WAIT_FOR(!intel_adsp_hda_is_enabled(cfg->base, cfg->regblock_size, channel), 1000,
k_busy_wait(1))) {
return -EBUSY;
}

return pm_device_runtime_put(dev);
}

Expand Down
2 changes: 1 addition & 1 deletion soc/xtensa/intel_adsp/ace/power.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
if (state == PM_STATE_SOFT_OFF) {
/* restore clock gating state */
DSPCS.bootctl[cpu].bctl |=
(core_desc[0].bctl & DSPBR_BCTL_WAITIPCG);
(core_desc[cpu].bctl & DSPBR_BCTL_WAITIPCG);

#ifdef CONFIG_ADSP_IMR_CONTEXT_SAVE
if (cpu == 0) {
Expand Down
Loading