ASoC: Intel: Skylake: Fix module removal
Subsystems (3)
cover ASoC: Intel: Skylake: Fix module removal
Skyalke driver were crashing on module removal when we run "alsa reload".
The first issues was caused by component framwork regression which Russell fixed and in in 4.5. In driver there were still some missing order which needs to be fixed. This series first update the list parsing in core, then ensure proper freeup of code objects, and then esnureing driver does proper cleanup and i915 dependency
Vinod Koul (6):
ALSA: hda: use list macro for parsing on cleanup
ASoC: Intel: Skylake: free codec objects on removal
ASoC: Intel: Skylake: Freeup properly on skl_dsp_free
ASoC: Intel: Skylake: Unmap the address last
ASoC: Intel: Skylake: Call i915 exit last
ASoC: Intel: Skylake: remove call to pci_dev_put
sound/hda/ext/hdac_ext_stream.c | 5 ++--- sound/soc/intel/skylake/skl-sst-dsp.c | 5 +++++ sound/soc/intel/skylake/skl.c | 22 +++++++++++++++------- 3 files changed, 22 insertions(+), 10 deletions(-)
Thanks
Signature · 1 line
1.9.1
PATCH 1/6 ALSA: hda: use list macro for parsing on cleanup
It is always better to use list_for_each_entry_safe() while doing cleanup. So use this instead of open coding this in list in snd_hdac_stream_free_all()
--- sound/hda/ext/hdac_ext_stream.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
sound/hda/ext/hdac_ext_stream.c +2 -3
@@ -104,12 +104,11 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_init_all);*/ void snd_hdac_stream_free_all (struct hdac_ext_bus *ebus) { -struct hdac_stream *s; +struct hdac_stream *s, *_s;struct hdac_ext_stream *stream;struct hdac_bus *bus =ebus_to_hbus (ebus); -while (!list_empty (&bus->stream_list)) { - s = list_first_entry(&bus->stream_list, struct hdac_stream, list); +list_for_each_entry_safe (s, _s, &bus->stream_list, list) { stream =stream_to_hdac_ext_stream (s);snd_hdac_ext_stream_decouple (ebus, stream, false);list_del (&s->list);
Signature · 1 line
1.9.1
Re: [PATCH 1/6] ALSA: hda: use list macro for parsing on cleanup
Quoted 7 lines · Vinod Koul
It is always better to use
list_for_each_entry_safe()while doing cleanup. So use this instead of open coding this in list insnd_hdac_stream_free_all()Signed-off-by Jeeja KP <[email protected]>Signed-off-by Vinod Koul <[email protected]>
While this change is fine, we shouldn't trust blindly list_for_each_safe() as always safe. It assumes that the list removal is done only for the current item. But it's not always true. The loop in the current code is one of standard idiom in such a case.
In anyway, take my ack when Mark applies it:
Takashi
Quoted 26 lines
--- sound/hda/ext/hdac_ext_stream.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)sound/hda/ext/hdac_ext_stream.c +2
-3@@ -104,12 +104,11 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_init_all);*/ void snd_hdac_stream_free_all (struct hdac_ext_bus *ebus) { -struct hdac_stream *s; +struct hdac_stream *s, *_s;struct hdac_ext_stream *stream;struct hdac_bus *bus =ebus_to_hbus (ebus); -while (!list_empty (&bus->stream_list)) { - s = list_first_entry(&bus->stream_list, struct hdac_stream, list); +list_for_each_entry_safe (s, _s, &bus->stream_list, list) { stream =stream_to_hdac_ext_stream (s);snd_hdac_ext_stream_decouple (ebus, stream, false);list_del (&s->list);Signature · 1 line
1.9.1
Re: [PATCH 1/6] ALSA: hda: use list macro for parsing on cleanup
Quoted 7 lines · Takashi Iwai
Quoted 5 lines · Vinod Koul
It is always better to use
list_for_each_entry_safe()while doing cleanup. So use this instead of open coding this in list insnd_hdac_stream_free_all()
Quoted 7 lines
Quoted 2 lines
Signed-off-by Jeeja KP <[email protected]>Signed-off-by Vinod Koul <[email protected]>While this change is fine, we shouldn't trust blindly
list_for_each_safe()as always safe. It assumes that the list removal is done only for the current item. But it's not always true. The loop in the current code is one of standard idiom in such a case.
Yes thanks for the warning :)
Quoted 3 lines
In anyway, take my ack when Mark applies it:
Acked-by Takashi Iwai <[email protected]>
Will add this for v2
Quoted 1 line
~Vinod
Mark Brown
maintainerApplied "ALSA: hda: use list macro for parsing on cleanup" to the asoc tree
In reply to Vinod KoulThe patch
ALSA: hda: use list macro for parsing on cleanup
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
4a6c5e6a8d29e4d33858227db9179e91aa8a7407Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Tue, 15 Mar 2016 16:39:23 +0530
Subject: [PATCH] ALSA: hda: use list macro for parsing on cleanup
It is always better to use list_for_each_entry_safe() while doing cleanup. So use this instead of open coding this in list in snd_hdac_stream_free_all()
--- sound/hda/ext/hdac_ext_stream.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
sound/hda/ext/hdac_ext_stream.c +2 -3
@@ -104,12 +104,11 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_init_all);*/ void snd_hdac_stream_free_all (struct hdac_ext_bus *ebus) { -struct hdac_stream *s; +struct hdac_stream *s, *_s;struct hdac_ext_stream *stream;struct hdac_bus *bus =ebus_to_hbus (ebus); -while (!list_empty (&bus->stream_list)) { - s = list_first_entry(&bus->stream_list, struct hdac_stream, list); +list_for_each_entry_safe (s, _s, &bus->stream_list, list) { stream =stream_to_hdac_ext_stream (s);snd_hdac_ext_stream_decouple (ebus, stream, false);list_del (&s->list);
Signature · 1 line
2.7.0
PATCH 2/6 ASoC: Intel: Skylake: free codec objects on removal
In reply to Vinod KoulOn driver removal we should ask the core to remove the device objects as well, so invoke snd_hdac_ext_bus_device_remove() in remove.
--- sound/soc/intel/skylake/skl.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/soc/intel/skylake/skl.c +9 -0
@@ -454,6 +454,14 @@ static int skl_codec_create(struct hdac_ext_bus *ebus)return 0 ; } +/* +* codec destructor +*/ +static void skl_codecs_remove (struct hdac_ext_bus *ebus) +{ +snd_hdac_ext_bus_device_remove (ebus); +} +static const struct hdac_bus_ops bus_core_ops = { .command = snd_hdac_bus_send_cmd, .get_response = snd_hdac_bus_get_response,
@@ -725,6 +733,7 @@ static void skl_remove(struct pci_dev *pci)if (pci_dev_run_wake (pci))pm_runtime_get_noresume (&pci->dev);pci_dev_put (pci); +skl_codecs_remove (ebus);skl_platform_unregister (&pci->dev);skl_free_dsp (skl);skl_machine_device_unregister (skl);
Signature · 1 line
1.9.1
Mark Brown
maintainerRe: [PATCH 2/6] ASoC: Intel: Skylake: free codec objects on removal
sound/soc/intel/skylake/skl.c static int skl_codec_create(struct hdac_ext_bus *ebus)
Quoted 9 lines · Vinod Koul
sound/soc/intel/skylake/skl.c +8
-0+/* +* codec destructor +*/ +static void skl_codecs_remove (struct hdac_ext_bus *ebus) +{ +snd_hdac_ext_bus_device_remove (ebus); +} +skl_codecs_remove (ebus);
Why the wrapper here?
Re: [PATCH 2/6] ASoC: Intel: Skylake: free codec objects on removal
Quoted 10 lines · Mark Brown
Quoted 7 lines · Vinod Koul
sound/soc/intel/skylake/skl.c +7
-0+/* +* codec destructor +*/ +static void skl_codecs_remove (struct hdac_ext_bus *ebus) +{ +snd_hdac_ext_bus_device_remove (ebus); +}
Quoted 3 lines
sound/soc/intel/skylake/skl.c static void skl_remove(struct pci_dev *pci) · line 736
Quoted 1 line
sound/soc/intel/skylake/skl.c +1
-0+skl_codecs_remove (ebus);Why the wrapper here?
IIRC Shameless copy of old HDA code, but yes I don't think we need this, I will update this one.
Thanks for pointing out.
Signature · 1 line
~Vinod
PATCH 3/6 ASoC: Intel: Skylake: Freeup properly on skl_dsp_free
In reply to Vinod KoulWe are supposed to freeup the Code loader DMA allocation and ensure all interrupts are disabled before we disable dsp cores. So invoke these to ensure DSP shuts down properly.
--- sound/soc/intel/skylake/skl-sst-dsp.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/intel/skylake/skl-sst-dsp.c +5 -0
@@ -336,6 +336,11 @@ void skl_dsp_free(struct sst_dsp *dsp)skl_ipc_int_disable (dsp);free_irq (dsp->irq, dsp); + dsp->cl_dev.ops.cl_cleanup_controller (dsp); +skl_cldma_int_disable (dsp); +skl_ipc_op_int_disable (dsp); +skl_ipc_int_disable (dsp); +skl_dsp_disable_core (dsp); }EXPORT_SYMBOL_GPL (skl_dsp_free);
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: Freeup properly on skl_dsp_free" to the asoc tree
The patch
ASoC: Intel: Skylake: Freeup properly on skl_dsp_free
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
3f7f8489e25b180cf8de8a3ae3896b3f18fc4aa5Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Tue, 15 Mar 2016 16:39:25 +0530
Subject: [PATCH] ASoC: Intel: Skylake: Freeup properly on skl_dsp_free
We are supposed to freeup the Code loader DMA allocation and ensure all interrupts are disabled before we disable dsp cores. So invoke these to ensure DSP shuts down properly.
--- sound/soc/intel/skylake/skl-sst-dsp.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/intel/skylake/skl-sst-dsp.c +5 -0
@@ -336,6 +336,11 @@ void skl_dsp_free(struct sst_dsp *dsp)skl_ipc_int_disable (dsp);free_irq (dsp->irq, dsp); + dsp->cl_dev.ops.cl_cleanup_controller (dsp); +skl_cldma_int_disable (dsp); +skl_ipc_op_int_disable (dsp); +skl_ipc_int_disable (dsp); +skl_dsp_disable_core (dsp); }EXPORT_SYMBOL_GPL (skl_dsp_free);
Signature · 1 line
2.7.0
PATCH 4/6 ASoC: Intel: Skylake: Unmap the address last
In reply to Vinod KoulIn Skylake destructor we unmap the hardware address and then free links and streams. The stream free accesses hardware to write to registers and predictably causes oops.
So change the order and unmap last in destructor.
--- sound/soc/intel/skylake/skl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
sound/soc/intel/skylake/skl.c +4 -3
@@ -316,12 +316,13 @@ static int skl_free(struct hdac_ext_bus *ebus)if (bus->irq >=0 )free_irq (bus->irq, (void *)bus); -if (bus->remap_addr) -iounmap (bus->remap_addr); -snd_hdac_bus_free_stream_pages (bus);snd_hdac_stream_free_all (ebus);snd_hdac_link_free_all (ebus); + +if (bus->remap_addr) +iounmap (bus->remap_addr); +pci_release_regions (skl->pci);pci_disable_device (skl->pci);
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: Unmap the address last" to the asoc tree
The patch
ASoC: Intel: Skylake: Unmap the address last
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
077411e5eb8872736fdc5f3e7277719160918ddeMon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Tue, 15 Mar 2016 16:39:26 +0530
Subject: [PATCH] ASoC: Intel: Skylake: Unmap the address last
In Skylake destructor we unmap the hardware address and then free links and streams. The stream free accesses hardware to write to registers and predictably causes oops.
So change the order and unmap last in destructor.
--- sound/soc/intel/skylake/skl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
sound/soc/intel/skylake/skl.c +4 -3
@@ -316,12 +316,13 @@ static int skl_free(struct hdac_ext_bus *ebus)if (bus->irq >=0 )free_irq (bus->irq, (void *)bus); -if (bus->remap_addr) -iounmap (bus->remap_addr); -snd_hdac_bus_free_stream_pages (bus);snd_hdac_stream_free_all (ebus);snd_hdac_link_free_all (ebus); + +if (bus->remap_addr) +iounmap (bus->remap_addr); +pci_release_regions (skl->pci);pci_disable_device (skl->pci);
Signature · 1 line
2.7.0
PATCH 5/6 ASoC: Intel: Skylake: Call i915 exit last
In reply to Vinod KoulThe Skylake driver uses i915 component APIs to talk to display. On remove we should free up by invoking snd_hdac_i915_exit() but that should be last thing in remove routine, so move it to last in skl_free()
--- sound/soc/intel/skylake/skl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
sound/soc/intel/skylake/skl.c +2 -3
@@ -328,6 +328,8 @@ static int skl_free(struct hdac_ext_bus *ebus)snd_hdac_ext_bus_exit (ebus); +if (IS_ENABLED (CONFIG_SND_SOC_HDAC_HDMI )) +snd_hdac_i915_exit (&ebus->bus);return 0 ; }
@@ -728,9 +730,6 @@ static void skl_remove(struct pci_dev *pci)if (skl->tplg)release_firmware (skl->tplg); -if (IS_ENABLED (CONFIG_SND_SOC_HDAC_HDMI )) -snd_hdac_i915_exit (&ebus->bus); -if (pci_dev_run_wake (pci))pm_runtime_get_noresume (&pci->dev);pci_dev_put (pci);
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: Call i915 exit last" to the asoc tree
The patch
ASoC: Intel: Skylake: Call i915 exit last
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
5b2fe89856b2d0faaaea9e4b4b2c4920de7a600cMon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Tue, 15 Mar 2016 16:39:27 +0530
Subject: [PATCH] ASoC: Intel: Skylake: Call i915 exit last
The Skylake driver uses i915 component APIs to talk to display. On remove we should free up by invoking snd_hdac_i915_exit() but that should be last thing in remove routine, so move it to last in skl_free()
--- sound/soc/intel/skylake/skl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
sound/soc/intel/skylake/skl.c +2 -3
@@ -328,6 +328,8 @@ static int skl_free(struct hdac_ext_bus *ebus)snd_hdac_ext_bus_exit (ebus); +if (IS_ENABLED (CONFIG_SND_SOC_HDAC_HDMI )) +snd_hdac_i915_exit (&ebus->bus);return 0 ; }
@@ -720,9 +722,6 @@ static void skl_remove(struct pci_dev *pci)if (skl->tplg)release_firmware (skl->tplg); -if (IS_ENABLED (CONFIG_SND_SOC_HDAC_HDMI )) -snd_hdac_i915_exit (&ebus->bus); -if (pci_dev_run_wake (pci))pm_runtime_get_noresume (&pci->dev);pci_dev_put (pci);
Signature · 1 line
2.7.0
PATCH 6/6 ASoC: Intel: Skylake: remove call to pci_dev_put
In reply to Vinod KoulIn driver remove we call pci_dev_put(), that is not required as we never call pci_dev_get() so remove that.
--- sound/soc/intel/skylake/skl.c | 1 - 1 file changed, 1 deletion(-)
sound/soc/intel/skylake/skl.c +0 -1
@@ -732,7 +732,6 @@ static void skl_remove(struct pci_dev *pci)if (pci_dev_run_wake (pci))pm_runtime_get_noresume (&pci->dev); -pci_dev_put (pci);skl_codecs_remove (ebus);skl_platform_unregister (&pci->dev);skl_free_dsp (skl);
Signature · 1 line
1.9.1