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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 D48E1C433E0 for ; Thu, 31 Dec 2020 10:53:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9D12A20795 for ; Thu, 31 Dec 2020 10:53:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726499AbgLaKw4 (ORCPT ); Thu, 31 Dec 2020 05:52:56 -0500 Received: from mx2.suse.de ([195.135.220.15]:51424 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726155AbgLaKw4 (ORCPT ); Thu, 31 Dec 2020 05:52:56 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id A8669AD1E; Thu, 31 Dec 2020 10:52:14 +0000 (UTC) Date: Thu, 31 Dec 2020 11:52:14 +0100 Message-ID: From: Takashi Iwai To: Kai-Heng Feng Cc: pierre-louis.bossart@linux.intel.com, lgirdwood@gmail.com, ranjani.sridharan@linux.intel.com, kai.vehmanen@linux.intel.com, daniel.baluta@nxp.com, Mark Brown , Jaroslav Kysela , Takashi Iwai , Guennadi Liakhovetski , Rander Wang , Payal Kshirsagar , Keyon Jie , Kuninori Morimoto , Marcin Rajwa , Cezary Rojewski , Fred Oh , Bard Liao , Amery Song , sound-open-firmware@alsa-project.org (moderated list:SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS), alsa-devel@alsa-project.org (moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM...), linux-kernel@vger.kernel.org (open list) Subject: Re: [PATCH 1/2] ASoC: SOF: Intel: hda: Modify existing helper to disable WAKEEN In-Reply-To: <20201229133817.190160-1-kai.heng.feng@canonical.com> References: <20201229133817.190160-1-kai.heng.feng@canonical.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 29 Dec 2020 14:38:14 +0100, Kai-Heng Feng wrote: > > Modify hda_codec_jack_wake_enable() to also support disable WAKEEN. > This is a preparation for next patch. > > No functional change intended. Maybe it's better to mention that this patch moves the WAKEEN disablement call out of hda_codec_jack_check() into hda_codec_jack_wake_enable(), too. thanks, Takashi > > Signed-off-by: Kai-Heng Feng > --- > sound/soc/sof/intel/hda-codec.c | 16 +++++++--------- > sound/soc/sof/intel/hda-dsp.c | 6 ++++-- > sound/soc/sof/intel/hda.h | 2 +- > 3 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c > index 6875fa570c2c..bc9ac4abdab5 100644 > --- a/sound/soc/sof/intel/hda-codec.c > +++ b/sound/soc/sof/intel/hda-codec.c > @@ -63,16 +63,18 @@ static int hda_codec_load_module(struct hda_codec *codec) > } > > /* enable controller wake up event for all codecs with jack connectors */ > -void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev) > +void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev, bool enable) > { > struct hda_bus *hbus = sof_to_hbus(sdev); > struct hdac_bus *bus = sof_to_bus(sdev); > struct hda_codec *codec; > unsigned int mask = 0; > > - list_for_each_codec(codec, hbus) > - if (codec->jacktbl.used) > - mask |= BIT(codec->core.addr); > + if (enable) { > + list_for_each_codec(codec, hbus) > + if (codec->jacktbl.used) > + mask |= BIT(codec->core.addr); > + } > > snd_hdac_chip_updatew(bus, WAKEEN, STATESTS_INT_MASK, mask); > } > @@ -81,12 +83,8 @@ void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev) > void hda_codec_jack_check(struct snd_sof_dev *sdev) > { > struct hda_bus *hbus = sof_to_hbus(sdev); > - struct hdac_bus *bus = sof_to_bus(sdev); > struct hda_codec *codec; > > - /* disable controller Wake Up event*/ > - snd_hdac_chip_updatew(bus, WAKEEN, STATESTS_INT_MASK, 0); > - > list_for_each_codec(codec, hbus) > /* > * Wake up all jack-detecting codecs regardless whether an event > @@ -97,7 +95,7 @@ void hda_codec_jack_check(struct snd_sof_dev *sdev) > codec->jackpoll_interval); > } > #else > -void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev) {} > +void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev, bool enable) {} > void hda_codec_jack_check(struct snd_sof_dev *sdev) {} > #endif /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */ > EXPORT_SYMBOL_NS(hda_codec_jack_wake_enable, SND_SOC_SOF_HDA_AUDIO_CODEC); > diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c > index 2b001151fe37..7d00107cf3b2 100644 > --- a/sound/soc/sof/intel/hda-dsp.c > +++ b/sound/soc/sof/intel/hda-dsp.c > @@ -617,7 +617,7 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend) > > #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) > if (runtime_suspend) > - hda_codec_jack_wake_enable(sdev); > + hda_codec_jack_wake_enable(sdev, true); > > /* power down all hda link */ > snd_hdac_ext_bus_link_power_down_all(bus); > @@ -683,8 +683,10 @@ static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume) > > #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) > /* check jack status */ > - if (runtime_resume) > + if (runtime_resume) { > + hda_codec_jack_wake_enable(sdev, false); > hda_codec_jack_check(sdev); > + } > > /* turn off the links that were off before suspend */ > list_for_each_entry(hlink, &bus->hlink_list, list) { > diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h > index 9ec8ae0fd649..a3b6f3e9121c 100644 > --- a/sound/soc/sof/intel/hda.h > +++ b/sound/soc/sof/intel/hda.h > @@ -650,7 +650,7 @@ void sof_hda_bus_init(struct hdac_bus *bus, struct device *dev); > */ > void hda_codec_probe_bus(struct snd_sof_dev *sdev, > bool hda_codec_use_common_hdmi); > -void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev); > +void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev, bool enable); > void hda_codec_jack_check(struct snd_sof_dev *sdev); > > #endif /* CONFIG_SND_SOC_SOF_HDA */ > -- > 2.29.2 >