From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751350AbdKURHi (ORCPT ); Tue, 21 Nov 2017 12:07:38 -0500 Received: from mx2.suse.de ([195.135.220.15]:38837 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751145AbdKURH2 (ORCPT ); Tue, 21 Nov 2017 12:07:28 -0500 Date: Tue, 21 Nov 2017 18:07:27 +0100 Message-ID: From: Takashi Iwai To: Pierre-Louis Bossart Cc: alsa-devel@alsa-project.org, arnd@arndb.de, linux-kernel@vger.kernel.org, liam.r.girdwood@linux.intel.com, vinod.koul@intel.com, broonie@kernel.org, andriy.shevchenko@linux.intel.com, torvalds@linux-foundation.org Subject: Re: [alsa-devel] [RFC PATCH 1/7] ASoC: Intel: Fix Kconfig In-Reply-To: <20171118000202.22302-2-pierre-louis.bossart@linux.intel.com> References: <20171118000202.22302-1-pierre-louis.bossart@linux.intel.com> <20171118000202.22302-2-pierre-louis.bossart@linux.intel.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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 18 Nov 2017 01:01:56 +0100, Pierre-Louis Bossart wrote: > > Follow network example suggested by Linus, move Intel definitions > in if/endif block and clarify which options distro configurations > should enable - everything except legacy Baytrail stuff and > NOCODEC (test only) > > There should be no functionality change - except that sound capabilities > are restored when using older configs without any user selection. > > Fixes: f6a118a800e3 ("ASoC: Intel: clarify Kconfig dependencies") > Reported-by: Linus Torvalds > Signed-off-by: Pierre-Louis Bossart A few another things I noticed while looking at the end result: > config SND_SOC_INTEL_SKYLAKE > tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL" > - depends on SND_SOC_INTEL_SST_TOPLEVEL && PCI && ACPI > + depends on PCI && ACPI > select SND_HDA_EXT_CORE > select SND_HDA_DSP_LOADER > select SND_SOC_TOPOLOGY > select SND_SOC_INTEL_SST > + select SND_SOC_INTEL_COMMON > + > +endif ## SND_SOC_INTEL_SST_TOPLEVEL This endif should cover the whole including the source boards/Kconfig. In that way, deselecting SND_SOC_INTEL_SST_TOPLEVEL will skip the whole. As of this patch, you'll be still asked about the board config even if you say TOPLEVEL=n. > # ASoC codec drivers > source "sound/soc/intel/boards/Kconfig" > + > +# configs common to SST and SOF to compile sound/soc/intel/common > +# directory and use matching tables > + > +config SND_SOC_INTEL_COMMON > + tristate > + select SND_SOC_ACPI_INTEL_MATCH if ACPI > + > +config SND_SOC_ACPI_INTEL_MATCH > + tristate > + select SND_SOC_ACPI if ACPI ... so here should be placed the endif. > diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig > index 6f754708a48c..4ae44b0cea0a 100644 > --- a/sound/soc/intel/boards/Kconfig > +++ b/sound/soc/intel/boards/Kconfig > @@ -1,7 +1,14 @@ > -config SND_SOC_INTEL_MACH > - tristate "Intel Audio machine drivers" > - depends on SND_SOC_INTEL_SST_TOPLEVEL > - select SND_SOC_ACPI_INTEL_MATCH if ACPI > +config SND_SOC_INTEL_MACH > + bool "Intel ASoC machine drivers" > + default y > + help > + Intel ASoC Audio Machine Drivers. If you have a Intel machine that > + has audio controller with a DSP and I2S or DMIC port, then > + enable this option by saying Y > + > + Note that the answer to this question doesn't directly affect the > + kernel: saying N will just cause the configurator to skip all > + the questions about Intel SST machine drivers. Do we still need this filtering? Since we have a top-level filter, users who want to skip the Intel stuff can say N there already, and I can't imagine anyone who want only the SST core / platform drivers built without machine drivers explicitly. thanks, Takashi From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [RFC PATCH 1/7] ASoC: Intel: Fix Kconfig Date: Tue, 21 Nov 2017 18:07:27 +0100 Message-ID: References: <20171118000202.22302-1-pierre-louis.bossart@linux.intel.com> <20171118000202.22302-2-pierre-louis.bossart@linux.intel.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 28446266F52 for ; Tue, 21 Nov 2017 18:07:27 +0100 (CET) In-Reply-To: <20171118000202.22302-2-pierre-louis.bossart@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Pierre-Louis Bossart Cc: alsa-devel@alsa-project.org, arnd@arndb.de, vinod.koul@intel.com, linux-kernel@vger.kernel.org, liam.r.girdwood@linux.intel.com, broonie@kernel.org, andriy.shevchenko@linux.intel.com, torvalds@linux-foundation.org List-Id: alsa-devel@alsa-project.org On Sat, 18 Nov 2017 01:01:56 +0100, Pierre-Louis Bossart wrote: > > Follow network example suggested by Linus, move Intel definitions > in if/endif block and clarify which options distro configurations > should enable - everything except legacy Baytrail stuff and > NOCODEC (test only) > > There should be no functionality change - except that sound capabilities > are restored when using older configs without any user selection. > > Fixes: f6a118a800e3 ("ASoC: Intel: clarify Kconfig dependencies") > Reported-by: Linus Torvalds > Signed-off-by: Pierre-Louis Bossart A few another things I noticed while looking at the end result: > config SND_SOC_INTEL_SKYLAKE > tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL" > - depends on SND_SOC_INTEL_SST_TOPLEVEL && PCI && ACPI > + depends on PCI && ACPI > select SND_HDA_EXT_CORE > select SND_HDA_DSP_LOADER > select SND_SOC_TOPOLOGY > select SND_SOC_INTEL_SST > + select SND_SOC_INTEL_COMMON > + > +endif ## SND_SOC_INTEL_SST_TOPLEVEL This endif should cover the whole including the source boards/Kconfig. In that way, deselecting SND_SOC_INTEL_SST_TOPLEVEL will skip the whole. As of this patch, you'll be still asked about the board config even if you say TOPLEVEL=n. > # ASoC codec drivers > source "sound/soc/intel/boards/Kconfig" > + > +# configs common to SST and SOF to compile sound/soc/intel/common > +# directory and use matching tables > + > +config SND_SOC_INTEL_COMMON > + tristate > + select SND_SOC_ACPI_INTEL_MATCH if ACPI > + > +config SND_SOC_ACPI_INTEL_MATCH > + tristate > + select SND_SOC_ACPI if ACPI ... so here should be placed the endif. > diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig > index 6f754708a48c..4ae44b0cea0a 100644 > --- a/sound/soc/intel/boards/Kconfig > +++ b/sound/soc/intel/boards/Kconfig > @@ -1,7 +1,14 @@ > -config SND_SOC_INTEL_MACH > - tristate "Intel Audio machine drivers" > - depends on SND_SOC_INTEL_SST_TOPLEVEL > - select SND_SOC_ACPI_INTEL_MATCH if ACPI > +config SND_SOC_INTEL_MACH > + bool "Intel ASoC machine drivers" > + default y > + help > + Intel ASoC Audio Machine Drivers. If you have a Intel machine that > + has audio controller with a DSP and I2S or DMIC port, then > + enable this option by saying Y > + > + Note that the answer to this question doesn't directly affect the > + kernel: saying N will just cause the configurator to skip all > + the questions about Intel SST machine drivers. Do we still need this filtering? Since we have a top-level filter, users who want to skip the Intel stuff can say N there already, and I can't imagine anyone who want only the SST core / platform drivers built without machine drivers explicitly. thanks, Takashi