From f0326f72498cc572aa8692d7c6e875249cf35f06 Mon Sep 17 00:00:00 2001 From: Tom Burdick Date: Tue, 17 Oct 2023 14:54:57 -0500 Subject: [PATCH] tests: dma_loopback: Intel ADSP ACE15 disable PM Disable power management for this particular test case as it expects a particular pattern of pm get/puts that isn't matched by the driver and usage in SoF. Signed-off-by: Tom Burdick --- drivers/dma/dma_intel_adsp_gpdma.c | 4 +++- drivers/power_domain/power_domain_intel_adsp.c | 3 +++ .../dma/loop_transfer/boards/intel_adsp_ace15_mtpm.conf | 7 ++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/dma/dma_intel_adsp_gpdma.c b/drivers/dma/dma_intel_adsp_gpdma.c index 1601d9af6ac..50e1fdae50e 100644 --- a/drivers/dma/dma_intel_adsp_gpdma.c +++ b/drivers/dma/dma_intel_adsp_gpdma.c @@ -320,6 +320,7 @@ static int intel_adsp_gpdma_enable(const struct device *dev) return 0; } +#ifdef CONFIG_PM_DEVICE static int intel_adsp_gpdma_disable(const struct device *dev) { const struct intel_adsp_gpdma_cfg *const dev_cfg = dev->config; @@ -328,7 +329,8 @@ static int intel_adsp_gpdma_disable(const struct device *dev) sys_write32(sys_read32(reg) & ~SHIM_CLKCTL_LPGPDMA_SPA, reg); return 0; } -#endif +#endif /* CONFIG_PM_DEVICE */ +#endif /* CONFIG_SOC_SERIES_INTEL_ACE */ static int intel_adsp_gpdma_power_on(const struct device *dev) { diff --git a/drivers/power_domain/power_domain_intel_adsp.c b/drivers/power_domain/power_domain_intel_adsp.c index 21df893b127..c0ca87b652e 100644 --- a/drivers/power_domain/power_domain_intel_adsp.c +++ b/drivers/power_domain/power_domain_intel_adsp.c @@ -17,6 +17,7 @@ struct pg_bits { uint32_t CPA_bit; }; +#ifdef CONFIG_PM_DEVICE static int pd_intel_adsp_set_power_enable(struct pg_bits *bits, bool power_enable) { uint16_t SPA_bit_mask = BIT(bits->SPA_bit); @@ -65,6 +66,8 @@ static int pd_intel_adsp_pm_action(const struct device *dev, enum pm_device_acti return ret; } +#endif /* CONFIG_PM_DEVICE */ + static int pd_intel_adsp_init(const struct device *dev) { pm_device_init_suspended(dev); diff --git a/tests/drivers/dma/loop_transfer/boards/intel_adsp_ace15_mtpm.conf b/tests/drivers/dma/loop_transfer/boards/intel_adsp_ace15_mtpm.conf index 3707e852fcc..8c916f1ef93 100644 --- a/tests/drivers/dma/loop_transfer/boards/intel_adsp_ace15_mtpm.conf +++ b/tests/drivers/dma/loop_transfer/boards/intel_adsp_ace15_mtpm.conf @@ -1,5 +1,6 @@ -CONFIG_PM_DEVICE=y -CONFIG_PM_DEVICE_RUNTIME=y -CONFIG_PM_DEVICE_POWER_DOMAIN=y +CONFIG_PM=n +CONFIG_PM_DEVICE=n +CONFIG_PM_DEVICE_RUNTIME=n +CONFIG_PM_DEVICE_POWER_DOMAIN=n CONFIG_POWER_DOMAIN=y CONFIG_POWER_DOMAIN_INTEL_ADSP=y