From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A575EC282DD for ; Mon, 10 Jun 2019 07:17:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C3D120833 for ; Mon, 10 Jun 2019 07:17:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387941AbfFJHRZ (ORCPT ); Mon, 10 Jun 2019 03:17:25 -0400 Received: from mga12.intel.com ([192.55.52.136]:43306 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387541AbfFJHRZ (ORCPT ); Mon, 10 Jun 2019 03:17:25 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jun 2019 00:17:24 -0700 X-ExtLoop1: 1 Received: from crojewsk-mobl1.ger.corp.intel.com (HELO [10.237.137.187]) ([10.237.137.187]) by orsmga007.jf.intel.com with ESMTP; 10 Jun 2019 00:17:22 -0700 Subject: Re: [PATCH 08/14] ASoC: Intel: Skylake: Properly cleanup on component removal To: =?UTF-8?Q?Amadeusz_S=c5=82awi=c5=84ski?= Cc: alsa-devel@alsa-project.org, Jaroslav Kysela , Takashi Iwai , Liam Girdwood , Mark Brown , Pierre-Louis Bossart , Jie Yang , linux-kernel@vger.kernel.org References: <20190605134556.10322-1-amadeuszx.slawinski@linux.intel.com> <20190605134556.10322-9-amadeuszx.slawinski@linux.intel.com> From: Cezary Rojewski Message-ID: <36e24c2a-feb4-4c6f-7bc5-76b13ff625a3@intel.com> Date: Mon, 10 Jun 2019 09:17:21 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20190605134556.10322-9-amadeuszx.slawinski@linux.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2019-06-05 15:45, Amadeusz Sławiński wrote: > When we remove component we need to reverse things which were done on > init, this consists of topology cleanup, lists cleanup and releasing > firmware. > > Currently cleanup handlers are put in wrong places or otherwise missing. > So add proper component cleanup function and perform cleanups in it. > > Signed-off-by: Amadeusz Sławiński > --- > sound/soc/intel/skylake/skl-pcm.c | 8 ++++++-- > sound/soc/intel/skylake/skl-topology.c | 15 +++++++++++++++ > sound/soc/intel/skylake/skl-topology.h | 2 ++ > sound/soc/intel/skylake/skl.c | 2 -- > 4 files changed, 23 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c > index 44062806fbed..7e8110c15258 100644 > --- a/sound/soc/intel/skylake/skl-pcm.c > +++ b/sound/soc/intel/skylake/skl-pcm.c > @@ -1459,8 +1459,12 @@ static int skl_platform_soc_probe(struct snd_soc_component *component) > > static void skl_pcm_remove(struct snd_soc_component *component) > { > - /* remove topology */ > - snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL); > + struct hdac_bus *bus = dev_get_drvdata(component->dev); > + struct skl *skl = bus_to_skl(bus); > + > + skl_tplg_exit(component, bus); > + > + skl_debugfs_exit(skl); > } > > static const struct snd_soc_component_driver skl_component = { > diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c > index 44f3b29a7210..3964262109ac 100644 > --- a/sound/soc/intel/skylake/skl-topology.c > +++ b/sound/soc/intel/skylake/skl-topology.c > @@ -3748,3 +3748,18 @@ int skl_tplg_init(struct snd_soc_component *component, struct hdac_bus *bus) > > return 0; > } > + > +void skl_tplg_exit(struct snd_soc_component *component, struct hdac_bus *bus) > +{ > + struct skl *skl = bus_to_skl(bus); > + struct skl_pipeline *ppl, *tmp; > + > + if (!list_empty(&skl->ppl_list)) > + list_for_each_entry_safe(ppl, tmp, &skl->ppl_list, node) > + list_del(&ppl->node); > + > + /* clean up topology */ > + snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL); > + > + release_firmware(skl->tplg); > +} In debugfs cleanup patch: [PATCH 07/14] ASoC: Intel: Skylake: Add function to cleanup debugfs interface you define skl_debugfs_exit separately - its usage is split and present in this very patch instead. However, for tplg counterpart - skl_tplg_exit - you've decided to combine both together. Why not separate tplg cleanup too? > diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h > index 82282cac9751..7d32c61c73e7 100644 > --- a/sound/soc/intel/skylake/skl-topology.h > +++ b/sound/soc/intel/skylake/skl-topology.h > @@ -471,6 +471,8 @@ void skl_tplg_set_be_dmic_config(struct snd_soc_dai *dai, > struct skl_pipe_params *params, int stream); > int skl_tplg_init(struct snd_soc_component *component, > struct hdac_bus *ebus); > +void skl_tplg_exit(struct snd_soc_component *component, > + struct hdac_bus *bus); > struct skl_module_cfg *skl_tplg_fe_get_cpr_module( > struct snd_soc_dai *dai, int stream); > int skl_tplg_update_pipe_params(struct device *dev, > diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c > index 6d6401410250..e4881ff427ea 100644 > --- a/sound/soc/intel/skylake/skl.c > +++ b/sound/soc/intel/skylake/skl.c > @@ -1119,14 +1119,12 @@ static void skl_remove(struct pci_dev *pci) > struct skl *skl = bus_to_skl(bus); > > cancel_work_sync(&skl->probe_work); > - release_firmware(skl->tplg); > > pm_runtime_get_noresume(&pci->dev); > > /* codec removal, invoke bus_device_remove */ > snd_hdac_ext_bus_device_remove(bus); > > - skl->debugfs = NULL; > skl_platform_unregister(&pci->dev); > skl_free_dsp(skl); > skl_machine_device_unregister(skl); >