diff mbox series

[v3,08/11] ASoC: Intel: atom: Make PCI dependency explicit

Message ID 20181223232521.11320-9-okaya@kernel.org (mailing list archive)
State Superseded, archived
Headers show
Series Specify CONFIG_PCI dependency explicitly | expand

Commit Message

Sinan Kaya Dec. 23, 2018, 11:25 p.m. UTC
Code does unconditional select for IOSF_MBI. IOSF_MBI driver depends on
CONFIG_PCI set but this is not specified anywhere.

Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
 sound/soc/intel/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Pierre-Louis Bossart Dec. 26, 2018, 5:35 p.m. UTC | #1
On 12/23/18 5:25 PM, Sinan Kaya wrote:
> Code does unconditional select for IOSF_MBI. IOSF_MBI driver depends on
> CONFIG_PCI set but this is not specified anywhere.

Can you please share the .config that exposes this problem? This hasn't 
changed in a long time and I wonder why this pops up now. You have 
similar cases elsewhere, e.g. arch/x86/Kconfig

config X86_INTEL_LPSS
     bool "Intel Low Power Subsystem Support"
     depends on X86 && ACPI
     select COMMON_CLK
     select PINCTRL
     select IOSF_MBI

or for the MMC.

config MMC_SDHCI_ACPI
     tristate "SDHCI support for ACPI enumerated SDHCI controllers"
     depends on MMC_SDHCI && ACPI
     select IOSF_MBI if X86

The use of IOSF_MBI is only for the Baytrail-CR detection and there are 
already in-flight patches to change the code and move it to a helper.

My understanding is that for compilation you only need CONFIG_x86 since 
there are fall-back routines available in iosf_mbi.h

Thanks!

>
> Signed-off-by: Sinan Kaya <okaya@kernel.org>
> ---
>   sound/soc/intel/Kconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> index 2fd1b61e8331..b0764b2fe001 100644
> --- a/sound/soc/intel/Kconfig
> +++ b/sound/soc/intel/Kconfig
> @@ -91,7 +91,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM_PCI
>   config SND_SST_ATOM_HIFI2_PLATFORM_ACPI
>   	tristate "ACPI HiFi2 (Baytrail, Cherrytrail) Platforms"
>   	default ACPI
> -	depends on X86 && ACPI
> +	depends on X86 && ACPI && PCI
>   	select SND_SST_IPC_ACPI
>   	select SND_SST_ATOM_HIFI2_PLATFORM
>   	select SND_SOC_ACPI_INTEL_MATCH
Sinan Kaya Dec. 26, 2018, 8:07 p.m. UTC | #2
On Wed, Dec 26, 2018 at 8:35 PM Pierre-Louis Bossart
<pierre-louis.bossart@linux.intel.com> wrote:
>
>
> On 12/23/18 5:25 PM, Sinan Kaya wrote:
> > Code does unconditional select for IOSF_MBI. IOSF_MBI driver depends on
> > CONFIG_PCI set but this is not specified anywhere.
>
> Can you please share the .config that exposes this problem? This hasn't
> changed in a long time and I wonder why this pops up now. You have
> similar cases elsewhere, e.g. arch/x86/Kconfig
>
Here is the background :

I have a changeset that was added to 4.21-rc1 that decouples  ACPI from
PCI. PCI was automatically selected when ACPI was chosen before.

This is no longer true.

If a code needs PCI support, it now needs to explicitly state that.

This allows usecase for smaller kernels and component isolation.

> config X86_INTEL_LPSS
>      bool "Intel Low Power Subsystem Support"
>      depends on X86 && ACPI
>      select COMMON_CLK
>      select PINCTRL
>      select IOSF_MBI
>
> or for the MMC.
>
> config MMC_SDHCI_ACPI
>      tristate "SDHCI support for ACPI enumerated SDHCI controllers"
>      depends on MMC_SDHCI && ACPI
>      select IOSF_MBI if X86
>
> The use of IOSF_MBI is only for the Baytrail-CR detection and there are
> already in-flight patches to change the code and move it to a helper.
>
> My understanding is that for compilation you only need CONFIG_x86 since
> there are fall-back routines available in iosf_mbi.h
>
> Thanks!
>
> >
> > Signed-off-by: Sinan Kaya <okaya@kernel.org>
> > ---
> >   sound/soc/intel/Kconfig | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> > index 2fd1b61e8331..b0764b2fe001 100644
> > --- a/sound/soc/intel/Kconfig
> > +++ b/sound/soc/intel/Kconfig
> > @@ -91,7 +91,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM_PCI
> >   config SND_SST_ATOM_HIFI2_PLATFORM_ACPI
> >       tristate "ACPI HiFi2 (Baytrail, Cherrytrail) Platforms"
> >       default ACPI
> > -     depends on X86 && ACPI
> > +     depends on X86 && ACPI && PCI
> >       select SND_SST_IPC_ACPI
> >       select SND_SST_ATOM_HIFI2_PLATFORM
> >       select SND_SOC_ACPI_INTEL_MATCH
diff mbox series

Patch

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 2fd1b61e8331..b0764b2fe001 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -91,7 +91,7 @@  config SND_SST_ATOM_HIFI2_PLATFORM_PCI
 config SND_SST_ATOM_HIFI2_PLATFORM_ACPI
 	tristate "ACPI HiFi2 (Baytrail, Cherrytrail) Platforms"
 	default ACPI
-	depends on X86 && ACPI
+	depends on X86 && ACPI && PCI
 	select SND_SST_IPC_ACPI
 	select SND_SST_ATOM_HIFI2_PLATFORM
 	select SND_SOC_ACPI_INTEL_MATCH