Patchwork [v6,05/11] platform/x86: intel_pmc: Make PCI dependency explicit

login
register
mail settings
Submitter Sinan Kaya
Date Jan. 5, 2019, 10:06 a.m.
Message ID <20190105100606.6673-6-okaya@kernel.org>
Download mbox | patch
Permalink /patch/693317/
State New
Headers show

Comments

Sinan Kaya - Jan. 5, 2019, 10:06 a.m.
After 'commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without
CONFIG_PCI set")' dependencies on CONFIG_PCI that previously were
satisfied implicitly through dependencies on CONFIG_ACPI have to be
specified directly. Code relies on PCI for execution. Specify this
in the Kconfig.

Fixes: 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
 drivers/platform/x86/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Rafael J. Wysocki - Jan. 9, 2019, 10:47 a.m.
On Saturday, January 5, 2019 11:06:00 AM CET Sinan Kaya wrote:
> After 'commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without
> CONFIG_PCI set")' dependencies on CONFIG_PCI that previously were
> satisfied implicitly through dependencies on CONFIG_ACPI have to be
> specified directly. Code relies on PCI for execution. Specify this
> in the Kconfig.
> 
> Fixes: 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
> Signed-off-by: Sinan Kaya <okaya@kernel.org>
> ---
>  drivers/platform/x86/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index b36ea14b41ad..7afb96cb1cd6 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -1174,7 +1174,7 @@ config INTEL_SMARTCONNECT
>  
>  config INTEL_PMC_IPC
>  	tristate "Intel PMC IPC Driver"
> -	depends on ACPI
> +	depends on ACPI && PCI
>  	---help---
>  	This driver provides support for PMC control on some Intel platforms.
>  	The PMC is an ARC processor which defines IPC commands for communication

Andy, you had some reservations regarding this patch IIRC.

Should I apply it?
Andy Shevchenko - Jan. 9, 2019, 11:10 a.m.
On Wed, Jan 9, 2019 at 12:48 PM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
>
> On Saturday, January 5, 2019 11:06:00 AM CET Sinan Kaya wrote:
> > After 'commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without
> > CONFIG_PCI set")' dependencies on CONFIG_PCI that previously were
> > satisfied implicitly through dependencies on CONFIG_ACPI have to be
> > specified directly. Code relies on PCI for execution. Specify this
> > in the Kconfig.
> >
> > Fixes: 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
> > Signed-off-by: Sinan Kaya <okaya@kernel.org>
> > ---
> >  drivers/platform/x86/Kconfig | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> > index b36ea14b41ad..7afb96cb1cd6 100644
> > --- a/drivers/platform/x86/Kconfig
> > +++ b/drivers/platform/x86/Kconfig
> > @@ -1174,7 +1174,7 @@ config INTEL_SMARTCONNECT
> >
> >  config INTEL_PMC_IPC
> >       tristate "Intel PMC IPC Driver"
> > -     depends on ACPI
> > +     depends on ACPI && PCI
> >       ---help---
> >       This driver provides support for PMC control on some Intel platforms.
> >       The PMC is an ARC processor which defines IPC commands for communication
>
> Andy, you had some reservations regarding this patch IIRC.
>
> Should I apply it?

Let's do it as a quick fix with something like below being added to
the commit message:

"For sake of a quick fix this introduces a new mandatory dependency to
the driver which may survive without it. Otherwise we need to revisit
the driver architecture to address this properly."
Rafael J. Wysocki - Jan. 15, 2019, 6:40 p.m.
On Wednesday, January 9, 2019 12:10:45 PM CET Andy Shevchenko wrote:
> On Wed, Jan 9, 2019 at 12:48 PM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> >
> > On Saturday, January 5, 2019 11:06:00 AM CET Sinan Kaya wrote:
> > > After 'commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without
> > > CONFIG_PCI set")' dependencies on CONFIG_PCI that previously were
> > > satisfied implicitly through dependencies on CONFIG_ACPI have to be
> > > specified directly. Code relies on PCI for execution. Specify this
> > > in the Kconfig.
> > >
> > > Fixes: 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
> > > Signed-off-by: Sinan Kaya <okaya@kernel.org>
> > > ---
> > >  drivers/platform/x86/Kconfig | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> > > index b36ea14b41ad..7afb96cb1cd6 100644
> > > --- a/drivers/platform/x86/Kconfig
> > > +++ b/drivers/platform/x86/Kconfig
> > > @@ -1174,7 +1174,7 @@ config INTEL_SMARTCONNECT
> > >
> > >  config INTEL_PMC_IPC
> > >       tristate "Intel PMC IPC Driver"
> > > -     depends on ACPI
> > > +     depends on ACPI && PCI
> > >       ---help---
> > >       This driver provides support for PMC control on some Intel platforms.
> > >       The PMC is an ARC processor which defines IPC commands for communication
> >
> > Andy, you had some reservations regarding this patch IIRC.
> >
> > Should I apply it?
> 
> Let's do it as a quick fix with something like below being added to
> the commit message:
> 
> "For sake of a quick fix this introduces a new mandatory dependency to
> the driver which may survive without it. Otherwise we need to revisit
> the driver architecture to address this properly."

Done, thanks!

Patch

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index b36ea14b41ad..7afb96cb1cd6 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1174,7 +1174,7 @@  config INTEL_SMARTCONNECT
 
 config INTEL_PMC_IPC
 	tristate "Intel PMC IPC Driver"
-	depends on ACPI
+	depends on ACPI && PCI
 	---help---
 	This driver provides support for PMC control on some Intel platforms.
 	The PMC is an ARC processor which defines IPC commands for communication