ASoC: Intel: Skylake: remaining D0i3 patches
Subsystems (3)
v3 cover ASoC: Intel: Skylake: remaining D0i3 patches
Hi Mark,
Looks like last two patches in last series posted were missed, so I am resending this
Jayachandran B (2):
ASoC: Intel: Skylake: Flush pending D0i3 request on suspend
ASoC: Intel: Skylake: remove pci device enabling calls on suspend
sound/soc/intel/skylake/skl-messages.c | 27 +++++++++++++++++++++++++++ sound/soc/intel/skylake/skl.c | 12 ++++++++++-- sound/soc/intel/skylake/skl.h | 1 + 3 files changed, 38 insertions(+), 2 deletions(-)
Signature · 1 line
1.9.1
PATCH v3 1/2 ASoC: Intel: Skylake: Flush pending D0i3 request on suspend
From: Jayachandran B <[email protected]>
While going to suspend, if we have any pending D0i3 work scheduled, flush that and force the DSP to goto D0i3 mode before going to suspend.
--- sound/soc/intel/skylake/skl-messages.c | 27 +++++++++++++++++++++++++++ sound/soc/intel/skylake/skl.c | 10 ++++++++++ sound/soc/intel/skylake/skl.h | 1 + 3 files changed, 38 insertions(+)
sound/soc/intel/skylake/skl-messages.c +27 -0
@@ -294,6 +294,33 @@ int skl_free_dsp(struct skl *skl)return 0 ; } +/* +* In the case of "suspend_active" i.e, the Audio IP being active +* during system suspend, immediately excecute any pending D0i3 work +* before suspending. This is needed for the IP to work in low power +* mode during system suspend. In the case of normal suspend, cancel +* any pending D0i3 work. +*/ +int skl_suspend_late_dsp (struct skl *skl) +{ +struct skl_sst *ctx = skl->skl_sst; +struct delayed_work *dwork; + +if (!ctx) +return 0 ; + + dwork = &ctx->d0i3.work; + +if (dwork->work.func) { +if (skl->supend_active) +flush_delayed_work (dwork); +else +cancel_delayed_work_sync (dwork); + } + +return 0 ; +} +int skl_suspend_dsp (struct skl *skl) {struct skl_sst *ctx = skl->skl_sst;
sound/soc/intel/skylake/skl.c +10 -0
@@ -228,6 +228,15 @@ static int skl_acquire_irq(struct hdac_ext_bus *ebus, int do_disconnect)return 0 ; } +static int skl_suspend_late (struct device *dev) +{ +struct pci_dev *pci =to_pci_dev (dev); +struct hdac_ext_bus *ebus =pci_get_drvdata (pci); +struct skl *skl =ebus_to_skl (ebus); + +return skl_suspend_late_dsp (skl); +} +#ifdef CONFIG_PM static int _skl_suspend (struct hdac_ext_bus *ebus) {
@@ -392,6 +401,7 @@ static int skl_runtime_resume(struct device *dev)static const struct dev_pm_ops skl_pm = { SET_SYSTEM_SLEEP_PM_OPS(skl_suspend, skl_resume)SET_RUNTIME_PM_OPS (skl_runtime_suspend, skl_runtime_resume,NULL ) + .suspend_late = skl_suspend_late, };/*
sound/soc/intel/skylake/skl.h +1 -0
@@ -124,6 +124,7 @@ struct nhlt_specific_cfg *skl_get_ep_blob(struct skl *skl, u32 instance,int skl_nhlt_update_topology_bin (struct skl *skl);int skl_init_dsp (struct skl *skl);int skl_free_dsp (struct skl *skl); +int skl_suspend_late_dsp (struct skl *skl);int skl_suspend_dsp (struct skl *skl);int skl_resume_dsp (struct skl *skl);void skl_cleanup_resources (struct skl *skl);
Signature · 1 line
1.9.1
PATCH v3 2/2 ASoC: Intel: Skylake: remove pci device enabling calls on suspend
In reply to Vinod KoulFrom: Jayachandran B <[email protected]>
We were invoking pci_disable_device() while going to suspend-to-idle and pci_enable_device() while coming back to active state.
Turns out that we do not need these calls as we only need system to be wake capable when in suspend-to-idle state. The wake capability is already done by enable_irq_wake() calls, so remove these unwanted calls in driver.
--- sound/soc/intel/skylake/skl.c | 2 -- 1 file changed, 2 deletions(-)
sound/soc/intel/skylake/skl.c +0 -2
@@ -299,7 +299,6 @@ static int skl_suspend(struct device *dev)enable_irq_wake (bus->irq);pci_save_state (pci); -pci_disable_device (pci); }else { ret =_skl_suspend (ebus);if (ret <0 )
@@ -342,7 +341,6 @@ static int skl_resume(struct device *dev)*/ if (skl->supend_active) {pci_restore_state (pci); - ret =pci_enable_device (pci);snd_hdac_ext_bus_link_power_up_all (ebus);disable_irq_wake (bus->irq);/*
Signature · 1 line
1.9.1
Mark Brown
maintainerQuoted 2 lines · Vinod Koul
Looks like last two patches in last series posted were missed, so I am resending this
Please allow a reasonable time for review. More complex and less well explained patches are going to take longer to review.
Quoted 7 lines · Mark Brown
Quoted 2 lines · Vinod Koul
Looks like last two patches in last series posted were missed, so I am resending this
Please allow a reasonable time for review. More complex and less well explained patches are going to take longer to review.
Sure thing, I somehow though these were missed, so resent just to be sure...
Signature · 1 line
~Vinod