* [PATCH v5 1/5] ACPI: Allow CONFIG_PCI to be unset for reboot
[not found] <20181212052846.32370-1-okaya@kernel.org>
@ 2018-12-12 5:28 ` Sinan Kaya
2018-12-12 5:28 ` [PATCH v5 2/5] ACPI / OSL: Stub out acpi_os_read_pci_configuration when CONFIG_PCI is unset Sinan Kaya
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Sinan Kaya @ 2018-12-12 5:28 UTC (permalink / raw)
To: linux-acpi; +Cc: Sinan Kaya, Rafael J. Wysocki, Len Brown, open list
Make PCI reboot conditional on PCI support being present on the kernel
configuration.
Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
drivers/acpi/reboot.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c
index 6fa9c2a4cfe9..d75e637ee36a 100644
--- a/drivers/acpi/reboot.c
+++ b/drivers/acpi/reboot.c
@@ -7,8 +7,6 @@
void acpi_reboot(void)
{
struct acpi_generic_address *rr;
- struct pci_bus *bus0;
- unsigned int devfn;
u8 reset_value;
if (acpi_disabled)
@@ -33,6 +31,11 @@ void acpi_reboot(void)
* on a device on bus 0. */
switch (rr->space_id) {
case ACPI_ADR_SPACE_PCI_CONFIG:
+ {
+#ifdef CONFIG_PCI
+ unsigned int devfn;
+ struct pci_bus *bus0;
+
/* The reset register can only live on bus 0. */
bus0 = pci_find_bus(0, 0);
if (!bus0)
@@ -44,8 +47,9 @@ void acpi_reboot(void)
/* Write the value that resets us. */
pci_bus_write_config_byte(bus0, devfn,
(rr->address & 0xffff), reset_value);
+#endif
break;
-
+ }
case ACPI_ADR_SPACE_SYSTEM_MEMORY:
case ACPI_ADR_SPACE_SYSTEM_IO:
printk(KERN_DEBUG "ACPI MEMORY or I/O RESET_REG.\n");
--
2.19.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v5 2/5] ACPI / OSL: Stub out acpi_os_read_pci_configuration when CONFIG_PCI is unset
[not found] <20181212052846.32370-1-okaya@kernel.org>
2018-12-12 5:28 ` [PATCH v5 1/5] ACPI: Allow CONFIG_PCI to be unset for reboot Sinan Kaya
@ 2018-12-12 5:28 ` Sinan Kaya
2018-12-12 9:31 ` Rafael J. Wysocki
2018-12-12 5:28 ` [PATCH v5 3/5] ACPI / OSL: Stub out acpi_os_write_pci_configuration " Sinan Kaya
` (2 subsequent siblings)
4 siblings, 1 reply; 7+ messages in thread
From: Sinan Kaya @ 2018-12-12 5:28 UTC (permalink / raw)
To: linux-acpi; +Cc: Sinan Kaya, Rafael J. Wysocki, Len Brown, open list
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;
+#endif
}
acpi_status
--
2.19.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v5 2/5] ACPI / OSL: Stub out acpi_os_read_pci_configuration when CONFIG_PCI is unset
2018-12-12 5:28 ` [PATCH v5 2/5] ACPI / OSL: Stub out acpi_os_read_pci_configuration when CONFIG_PCI is unset Sinan Kaya
@ 2018-12-12 9:31 ` Rafael J. Wysocki
0 siblings, 0 replies; 7+ messages in thread
From: Rafael J. Wysocki @ 2018-12-12 9:31 UTC (permalink / raw)
To: okaya
Cc: ACPI Devel Maling List, Rafael J. Wysocki, Len Brown,
Linux Kernel Mailing List
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
> --
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v5 3/5] ACPI / OSL: Stub out acpi_os_write_pci_configuration when CONFIG_PCI is unset
[not found] <20181212052846.32370-1-okaya@kernel.org>
2018-12-12 5:28 ` [PATCH v5 1/5] ACPI: Allow CONFIG_PCI to be unset for reboot Sinan Kaya
2018-12-12 5:28 ` [PATCH v5 2/5] ACPI / OSL: Stub out acpi_os_read_pci_configuration when CONFIG_PCI is unset Sinan Kaya
@ 2018-12-12 5:28 ` Sinan Kaya
2018-12-12 5:28 ` [PATCH v5 4/5] PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set Sinan Kaya
2018-12-12 5:28 ` [PATCH v5 5/5] ACPI / OSL: Remove PCI bits from ACPICA when CONFIG_PCI is unset Sinan Kaya
4 siblings, 0 replies; 7+ messages in thread
From: Sinan Kaya @ 2018-12-12 5:28 UTC (permalink / raw)
To: linux-acpi; +Cc: Sinan Kaya, Rafael J. Wysocki, Len Brown, open list
Getting ready to allow PCI to be disabled with ACPI enabled. Stub out
acpi_os_write_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 3e82b50ba811..7b1e58f93f37 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -809,6 +809,7 @@ acpi_status
acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
u64 value, u32 width)
{
+#ifdef CONFIG_PCI
int result, size;
switch (width) {
@@ -830,6 +831,9 @@ acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
reg, size, value);
return (result ? AE_ERROR : AE_OK);
+#else
+ return pr_warn_once("CONFIG_PCI is disabled\n") ? AE_SUPPORT : AE_OK;
+#endif
}
static void acpi_os_execute_deferred(struct work_struct *work)
--
2.19.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v5 4/5] PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set
[not found] <20181212052846.32370-1-okaya@kernel.org>
` (2 preceding siblings ...)
2018-12-12 5:28 ` [PATCH v5 3/5] ACPI / OSL: Stub out acpi_os_write_pci_configuration " Sinan Kaya
@ 2018-12-12 5:28 ` Sinan Kaya
2018-12-12 5:28 ` [PATCH v5 5/5] ACPI / OSL: Remove PCI bits from ACPICA when CONFIG_PCI is unset Sinan Kaya
4 siblings, 0 replies; 7+ messages in thread
From: Sinan Kaya @ 2018-12-12 5:28 UTC (permalink / raw)
To: linux-acpi
Cc: Sinan Kaya, Thomas Gleixner, Ingo Molnar, Borislav Petkov,
H. Peter Anvin, maintainer:X86 ARCHITECTURE 32-BIT AND 64-BIT,
Rafael J. Wysocki, Len Brown, Bjorn Helgaas, Robert Moore,
Erik Schmauss, Otavio Pontes, Christian König, Jan Kiszka,
Christian König,
open list:X86 ARCHITECTURE 32-BIT AND 64-BIT,
open list:PCI SUBSYSTEM
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 <okaya@kernel.org>
---
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v5 5/5] ACPI / OSL: Remove PCI bits from ACPICA when CONFIG_PCI is unset
[not found] <20181212052846.32370-1-okaya@kernel.org>
` (3 preceding siblings ...)
2018-12-12 5:28 ` [PATCH v5 4/5] PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set Sinan Kaya
@ 2018-12-12 5:28 ` Sinan Kaya
2018-12-12 9:25 ` Rafael J. Wysocki
4 siblings, 1 reply; 7+ messages in thread
From: Sinan Kaya @ 2018-12-12 5:28 UTC (permalink / raw)
To: linux-acpi
Cc: Sinan Kaya, Robert Moore, Erik Schmauss, Rafael J. Wysocki,
Len Brown, open list:ACPI COMPONENT ARCHITECTURE ACPICA,
open list
Now that we allow CONFIG_PCI to be unset, remove useless code from ACPICA
too.
Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
drivers/acpi/acpica/Makefile | 2 +-
drivers/acpi/osl.c | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index b14621da5413..59700433a96e 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@ -77,13 +77,13 @@ acpi-y += \
hwacpi.o \
hwesleep.o \
hwgpe.o \
- hwpci.o \
hwregs.o \
hwsleep.o \
hwvalid.o \
hwxface.o \
hwxfsleep.o
+acpi-$(CONFIG_PCI) += hwpci.o
acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
acpi-y += \
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 7b1e58f93f37..8b8eb17df3f2 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1837,3 +1837,12 @@ acpi_status acpi_os_enter_sleep(u8 sleep_state,
reg_a_value, reg_b_value);
return status;
}
+
+#ifndef CONFIG_PCI
+acpi_status acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id,
+ acpi_handle root_pci_device, acpi_handle pci_region)
+{
+ return AE_SUPPORT;
+}
+#endif
+
--
2.19.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v5 5/5] ACPI / OSL: Remove PCI bits from ACPICA when CONFIG_PCI is unset
2018-12-12 5:28 ` [PATCH v5 5/5] ACPI / OSL: Remove PCI bits from ACPICA when CONFIG_PCI is unset Sinan Kaya
@ 2018-12-12 9:25 ` Rafael J. Wysocki
0 siblings, 0 replies; 7+ messages in thread
From: Rafael J. Wysocki @ 2018-12-12 9:25 UTC (permalink / raw)
To: okaya
Cc: ACPI Devel Maling List, Robert Moore, Schmauss, Erik,
Rafael Wysocki, Len Brown, devel, Linux Kernel Mailing List
On Wed, Dec 12, 2018 at 6:29 AM Sinan Kaya <okaya@kernel.org> wrote:
>
> Now that we allow CONFIG_PCI to be unset, remove useless code from ACPICA
> too.
>
> Signed-off-by: Sinan Kaya <okaya@kernel.org>
> ---
> drivers/acpi/acpica/Makefile | 2 +-
> drivers/acpi/osl.c | 9 +++++++++
> 2 files changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
> index b14621da5413..59700433a96e 100644
> --- a/drivers/acpi/acpica/Makefile
> +++ b/drivers/acpi/acpica/Makefile
> @@ -77,13 +77,13 @@ acpi-y += \
> hwacpi.o \
> hwesleep.o \
> hwgpe.o \
> - hwpci.o \
> hwregs.o \
> hwsleep.o \
> hwvalid.o \
> hwxface.o \
> hwxfsleep.o
>
> +acpi-$(CONFIG_PCI) += hwpci.o
> acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
>
> acpi-y += \
> diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
> index 7b1e58f93f37..8b8eb17df3f2 100644
> --- a/drivers/acpi/osl.c
> +++ b/drivers/acpi/osl.c
> @@ -1837,3 +1837,12 @@ acpi_status acpi_os_enter_sleep(u8 sleep_state,
> reg_a_value, reg_b_value);
> return status;
> }
> +
> +#ifndef CONFIG_PCI
> +acpi_status acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id,
> + acpi_handle root_pci_device, acpi_handle pci_region)
> +{
> + return AE_SUPPORT;
> +}
> +#endif
> +
> --
I would prefer the header to be modified instead. Yes, it is an
ACPICA header, but then the change would complement the Makefile one
in a rather straightforward way.
^ permalink raw reply [flat|nested] 7+ messages in thread