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

login
register
mail settings
Submitter Sinan Kaya
Date Jan. 2, 2019, 6:10 p.m.
Message ID <20190102181038.4418-6-okaya@kernel.org>
Download mbox | patch
Permalink /patch/691733/
State New
Headers show

Comments

Sinan Kaya - Jan. 2, 2019, 6:10 p.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(-)
Andy Shevchenko - Jan. 4, 2019, 2:20 p.m.
On Wed, Jan 2, 2019 at 8:10 PM Sinan Kaya <okaya@kernel.org> 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.
>

Unfortunately, this is not how it should be fixed.

First of all, we (Heikki, Sathya, me —  all in Cc list) that this
driver should be refactored and unified with intel_scu_ipc.
Then, it has two drivers inside and PCI is just a glue for it which is
optional. Thus, needs to be split accordingly.

> 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
> --
> 2.19.0
>
Sinan Kaya - Jan. 4, 2019, 3:07 p.m.
On 1/4/2019 9:20 AM, Andy Shevchenko wrote:
> Unfortunately, this is not how it should be fixed.
> 
> First of all, we (Heikki, Sathya, me —  all in Cc list) that this
> driver should be refactored and unified with intel_scu_ipc.
> Then, it has two drivers inside and PCI is just a glue for it which is
> optional. Thus, needs to be split accordingly.

OK. Two questions:

1. How should I change this now?
2. Can you change the Kconfig accordingly after you merge the two drivers?

I'm focused on the build failure at this moment.

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