2021-04-21 17:32:46

by Arnd Bergmann

[permalink] [raw]
Subject: [PATCH] platform/x86: intel_pmc_core: add ACPI dependency

From: Arnd Bergmann <[email protected]>

The driver now fails to build without ACPI:

drivers/platform/x86/intel_pmc_core.c: In function 'pmc_core_get_tgl_lpm_reqs':
drivers/platform/x86/intel_pmc_core.c:617:41: error: invalid use of undefined type 'struct acpi_device'
617 | out_obj = acpi_evaluate_dsm(adev->handle, &s0ix_dsm_guid, 0,

This could probably be made optional, but it won't be used without
ACPI in practice, so just add a Kconfig dependency.

Fixes: 428131364f00 ("platform/x86: intel_pmc_core: Get LPM requirements for Tiger Lake")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/platform/x86/Kconfig | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 697fc446ac41..2714f7c3843e 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1194,6 +1194,7 @@ config INTEL_MRFLD_PWRBTN
config INTEL_PMC_CORE
tristate "Intel PMC Core driver"
depends on PCI
+ depends on ACPI
help
The Intel Platform Controller Hub for Intel Core SoCs provides access
to Power Management Controller registers via various interfaces. This
--
2.29.2


2021-04-21 19:05:10

by Hans de Goede

[permalink] [raw]
Subject: Re: [PATCH] platform/x86: intel_pmc_core: add ACPI dependency

Hi,

On 4/21/21 3:49 PM, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The driver now fails to build without ACPI:
>
> drivers/platform/x86/intel_pmc_core.c: In function 'pmc_core_get_tgl_lpm_reqs':
> drivers/platform/x86/intel_pmc_core.c:617:41: error: invalid use of undefined type 'struct acpi_device'
> 617 | out_obj = acpi_evaluate_dsm(adev->handle, &s0ix_dsm_guid, 0,
>
> This could probably be made optional, but it won't be used without
> ACPI in practice, so just add a Kconfig dependency.
>
> Fixes: 428131364f00 ("platform/x86: intel_pmc_core: Get LPM requirements for Tiger Lake")
> Signed-off-by: Arnd Bergmann <[email protected]>

Thank you for your patch, I've applied this patch to my review-hans
branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans

Note it will show up in my review-hans branch once I've pushed my
local branch there, which might take a while.

Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.

Regards,

Hans




> ---
> drivers/platform/x86/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 697fc446ac41..2714f7c3843e 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -1194,6 +1194,7 @@ config INTEL_MRFLD_PWRBTN
> config INTEL_PMC_CORE
> tristate "Intel PMC Core driver"
> depends on PCI
> + depends on ACPI
> help
> The Intel Platform Controller Hub for Intel Core SoCs provides access
> to Power Management Controller registers via various interfaces. This
>

2021-04-22 01:08:12

by David E. Box

[permalink] [raw]
Subject: Re: [PATCH] platform/x86: intel_pmc_core: add ACPI dependency

Thanks for the fix Arnd. Thought I could get away with not adding the
dependency since the function is stubbed but didn't realize struct
acpi_device wouldn't be defined. Should have build tested it.

David

On Wed, 2021-04-21 at 15:49 +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The driver now fails to build without ACPI:
>
> drivers/platform/x86/intel_pmc_core.c: In function
> 'pmc_core_get_tgl_lpm_reqs':
> drivers/platform/x86/intel_pmc_core.c:617:41: error: invalid use of
> undefined type 'struct acpi_device'
>   617 |         out_obj = acpi_evaluate_dsm(adev->handle,
> &s0ix_dsm_guid, 0,
>
> This could probably be made optional, but it won't be used without
> ACPI in practice, so just add a Kconfig dependency.
>
> Fixes: 428131364f00 ("platform/x86: intel_pmc_core: Get LPM
> requirements for Tiger Lake")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
>  drivers/platform/x86/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/platform/x86/Kconfig
> b/drivers/platform/x86/Kconfig
> index 697fc446ac41..2714f7c3843e 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -1194,6 +1194,7 @@ config INTEL_MRFLD_PWRBTN
>  config INTEL_PMC_CORE
>         tristate "Intel PMC Core driver"
>         depends on PCI
> +       depends on ACPI
>         help
>           The Intel Platform Controller Hub for Intel Core SoCs
> provides access
>           to Power Management Controller registers via various
> interfaces. This