Re: [PATCH v5 2/5] ACPI / OSL: Stub out acpi_os_read_pci_configuration when CONFIG_PCI is unset

Rafael J. Wysocki
2018-12-12T09:31:30Z

On Wed, Dec 12, 2018 at 6:29 AM Sinan Kaya <okaya@kernel.org> wrote:
>
> Getting ready to allow PCI to be disabled with ACPI enabled. Stub out
> acpi_os_read_pci_configuration function that depend on PCI.
>
> Signed-off-by: Sinan Kaya <okaya@kernel.org>
> ---
> drivers/acpi/osl.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
> index b48874b8e1ea..3e82b50ba811 100644
> --- a/drivers/acpi/osl.c
> +++ b/drivers/acpi/osl.c
> @@ -773,6 +773,7 @@ acpi_status
> acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
> u64 *value, u32 width)
> {
> +#ifdef CONFIG_PCI
> int result, size;
> u32 value32;
>
> @@ -799,6 +800,9 @@ acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
> *value = value32;
>
> return (result ? AE_ERROR : AE_OK);
> +#else
> + return pr_warn_once("CONFIG_PCI is disabled\n") ? AE_SUPPORT : AE_OK;

What about saying "PCI configuration space access is not supported" instead?

> +#endif
> }
>
> acpi_status
> --