From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA335C43387 for ; Fri, 14 Dec 2018 21:52:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05639208C1 for ; Fri, 14 Dec 2018 21:52:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544824365; bh=fqff81EFvKFaVm8jjBD+dP1nk0DKppbK7W3AYXGJMJA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=mCCCHkNik3XyT9BPDkAQBXZ1v+Uxt0J+f9xizD1N5aA7+lli7pgCaCdWLERIDoMUZ jB9xgR5kxlSxprJ4uYKYRB0wU59vt6Jv/Wk7f7CFmiPUG5qg0rp/AN4Mj/2HSY2czz sXonji3IBBvXQTtph7q66oukjmHZkLMCpPXxdPuY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731213AbeLNVwn (ORCPT ); Fri, 14 Dec 2018 16:52:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:49458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730734AbeLNVwn (ORCPT ); Fri, 14 Dec 2018 16:52:43 -0500 Received: from localhost (unknown [69.71.4.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 38D122086D; Fri, 14 Dec 2018 21:52:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544824362; bh=fqff81EFvKFaVm8jjBD+dP1nk0DKppbK7W3AYXGJMJA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=WkZ060K+6Gc2w74H7xfcPgyAru9wd2uK0H2TJBaK5898J5tizha0QW/HDQd7HbF7m Mo5PvdmoIwo4yvgnz/zr2VIVtAdhme1amgeoozF+B75UPSuLjrqGWbJzGGGFRHtMG0 nRo501t0aC3fom5GV1TGaABW5w2wWoCVTZsbFCS4= Date: Fri, 14 Dec 2018 15:52:39 -0600 From: Bjorn Helgaas To: Sinan Kaya Cc: linux-acpi@vger.kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "Rafael J. Wysocki" , Len Brown , Robert Moore , Erik Schmauss , Jan Kiszka , Andy Shevchenko , Otavio Pontes , Christian =?iso-8859-1?Q?K=F6nig?= , "open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "open list:PCI SUBSYSTEM" , "open list:ACPI COMPONENT ARCHITECTURE (ACPICA)" Subject: Re: [PATCH v9 3/6] PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set Message-ID: <20181214215239.GG20725@google.com> References: <20181214163319.27479-1-okaya@kernel.org> <20181214163319.27479-4-okaya@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181214163319.27479-4-okaya@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Dec 14, 2018 at 04:33:16PM +0000, Sinan Kaya wrote: > We are compiling PCI code today for systems with ACPI and no PCI > device present. Remove the useless code and reduce the tight > dependency. > > Signed-off-by: Sinan Kaya Acked-by: Bjorn Helgaas # PCI parts Looks like most of this series is ACPI-related, so I assume Rafael will pick this up. > --- > arch/x86/include/asm/pci_x86.h | 7 +++++++ > drivers/acpi/Kconfig | 1 - > drivers/acpi/Makefile | 2 +- > drivers/acpi/internal.h | 5 +++++ > drivers/pci/Makefile | 2 +- > include/acpi/acpi_drivers.h | 7 +++++++ > include/linux/acpi.h | 7 +++++++ > include/linux/pci.h | 4 ++++ > 8 files changed, 32 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h > index 959d618dbb17..73bb404f4d2a 100644 > --- a/arch/x86/include/asm/pci_x86.h > +++ b/arch/x86/include/asm/pci_x86.h > @@ -121,7 +121,14 @@ extern void __init dmi_check_pciprobe(void); > extern void __init dmi_check_skip_isa_align(void); > > /* some common used subsys_initcalls */ > +#ifdef CONFIG_PCI > extern int __init pci_acpi_init(void); > +#else > +static inline int __init pci_acpi_init(void) > +{ > + return -EINVAL; > +} > +#endif > extern void __init pcibios_irq_init(void); > extern int __init pcibios_init(void); > extern int pci_legacy_init(void); > diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig > index 7cea769c37df..a0abcb3bd673 100644 > --- a/drivers/acpi/Kconfig > +++ b/drivers/acpi/Kconfig > @@ -9,7 +9,6 @@ config ARCH_SUPPORTS_ACPI > menuconfig ACPI > bool "ACPI (Advanced Configuration and Power Interface) Support" > depends on ARCH_SUPPORTS_ACPI > - depends on PCI > select PNP > default y if X86 > help > diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile > index edc039313cd6..7c6afc111d76 100644 > --- a/drivers/acpi/Makefile > +++ b/drivers/acpi/Makefile > @@ -39,7 +39,7 @@ acpi-y += processor_core.o > acpi-$(CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC) += processor_pdc.o > acpi-y += ec.o > acpi-$(CONFIG_ACPI_DOCK) += dock.o > -acpi-y += pci_root.o pci_link.o pci_irq.o > +acpi-$(CONFIG_PCI) += pci_root.o pci_link.o pci_irq.o > obj-$(CONFIG_ACPI_MCFG) += pci_mcfg.o > acpi-y += acpi_lpss.o acpi_apd.o > acpi-y += acpi_platform.o > diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h > index 530a3f675490..b7060dae2789 100644 > --- a/drivers/acpi/internal.h > +++ b/drivers/acpi/internal.h > @@ -25,8 +25,13 @@ int acpi_osi_init(void); > acpi_status acpi_os_initialize1(void); > void init_acpi_device_notify(void); > int acpi_scan_init(void); > +#ifdef CONFIG_PCI > void acpi_pci_root_init(void); > void acpi_pci_link_init(void); > +#else > +static inline void acpi_pci_root_init(void) {} > +static inline void acpi_pci_link_init(void) {} > +#endif > void acpi_processor_init(void); > void acpi_platform_init(void); > void acpi_pnp_init(void); > diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile > index f2bda77a2df1..657d642fcc67 100644 > --- a/drivers/pci/Makefile > +++ b/drivers/pci/Makefile > @@ -11,6 +11,7 @@ ifdef CONFIG_PCI > obj-$(CONFIG_PROC_FS) += proc.o > obj-$(CONFIG_SYSFS) += slot.o > obj-$(CONFIG_OF) += of.o > +obj-$(CONFIG_ACPI) += pci-acpi.o > endif > > obj-$(CONFIG_PCI_QUIRKS) += quirks.o > @@ -20,7 +21,6 @@ obj-$(CONFIG_PCI_MSI) += msi.o > obj-$(CONFIG_PCI_ATS) += ats.o > obj-$(CONFIG_PCI_IOV) += iov.o > obj-$(CONFIG_PCI_BRIDGE_EMUL) += pci-bridge-emul.o > -obj-$(CONFIG_ACPI) += pci-acpi.o > obj-$(CONFIG_PCI_LABEL) += pci-label.o > obj-$(CONFIG_X86_INTEL_MID) += pci-mid.o > obj-$(CONFIG_PCI_SYSCALL) += syscall.o > diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h > index 14499757338f..de1804aeaf69 100644 > --- a/include/acpi/acpi_drivers.h > +++ b/include/acpi/acpi_drivers.h > @@ -88,7 +88,14 @@ int acpi_pci_link_free_irq(acpi_handle handle); > > struct pci_bus; > > +#ifdef CONFIG_PCI > struct pci_dev *acpi_get_pci_dev(acpi_handle); > +#else > +static inline struct pci_dev *acpi_get_pci_dev(acpi_handle handle) > +{ > + return NULL; > +} > +#endif > > /* Arch-defined function to add a bus to the system */ > > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index ed80f147bd50..eb1fdf4c196a 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -340,7 +340,14 @@ struct pci_dev; > int acpi_pci_irq_enable (struct pci_dev *dev); > void acpi_penalize_isa_irq(int irq, int active); > bool acpi_isa_irq_available(int irq); > +#ifdef CONFIG_PCI > void acpi_penalize_sci_irq(int irq, int trigger, int polarity); > +#else > +static inline void acpi_penalize_sci_irq(int irq, int trigger, > + int polarity) > +{ > +} > +#endif > void acpi_pci_irq_disable (struct pci_dev *dev); > > extern int ec_read(u8 addr, u8 *val); > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 11c71c4ecf75..51a5a5217667 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1960,7 +1960,11 @@ int pcibios_set_pcie_reset_state(struct pci_dev *dev, > enum pcie_reset_state state); > int pcibios_add_device(struct pci_dev *dev); > void pcibios_release_device(struct pci_dev *dev); > +#ifdef CONFIG_PCI > void pcibios_penalize_isa_irq(int irq, int active); > +#else > +static inline void pcibios_penalize_isa_irq(int irq, int active) {} > +#endif > int pcibios_alloc_irq(struct pci_dev *dev); > void pcibios_free_irq(struct pci_dev *dev); > resource_size_t pcibios_default_alignment(void); > -- > 2.19.0 >