ACPI: Cleanup header inclusions.
Subsystems (35)
RE: [PATCH v2] ACPI: Cleanup <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
In reply to Rafael J. WysockiQuoted 33 lines
From: Rafael J. Wysocki [mailto:[email protected]]
Sent: Wednesday, December 04, 2013 7:58 AMQuoted 29 lines · Rafael J. Wysocki
Quoted 27 lines · Rafael J. Wysocki
Quoted 18 lines · Lv Zheng
Replace direct inclusions of <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions.First of all, <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> should not be included directly from any files that are built forCONFIG_ACPIunset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. ForCONFIG_ACPIset, <linux/acpi.h> includes those files and for !CONFIG_ACPI it provides stub ACPI symbols to be used in that case.Second, there are ordering dependencies between those files that always have to be met. Namely, it is required that <
acpi/acpi_bus.h> be included prior to <acpi/acpi_drivers.h> so that theacpi_pci_rootdeclarations the latter depends on are always there. And <acpi/acpi.h> which provides basic ACPICA type declarations should always be included prior to any other ACPI headers inCONFIG_ACPIbuilds. That also is taken care of including <linux/acpi.h> as appropriate.Quoted 3 lines
This patch also includes necessary cleanups in the affected files where other ACPI headers is also included but not referenced.
This looks OK to me, but it touches several other subsystems. It's better to CC such things to linux-kernel at least.
Peter, Matthew, Tony, Konrad, Greg, Bjorn, do you have any objections against this?
Quoted 8 lines
Quoted 2 lines
Since no one seems to have problems with this, I've queued it up for the next ACPI pull request, if there are no problems with auto builds.
I replaced this patch with the following one due to built errors introduced by it for exotic combinations of
Kconfigoptions.The only difference is the few files where the /* FIXME: ... */ comments have been added.
Thanks for the helping.
Please also check if the fixes in the "ACPI: Cleanup direct ACPICA inclusions." series can actually sort the FIXMEs out.
Thanks and best regards
-Lv
Quoted 1,691 lines
Thanks,
Rafael---
From: Lv Zheng <[email protected]>
Subject: ACPI: Clean up inclusions of ACPI header filesReplace direct inclusions of <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions and remove some inclusions of those files that aren't necessary.First of all, <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> should not be included directly from any files that are built forCONFIG_ACPIunset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. ForCONFIG_ACPIset, <linux/acpi.h> includes those files and forCONFIG_ACPIunset it provides stub ACPI symbols to be used in that case.Second, there are ordering dependencies between those files that always have to be met. Namely, it is required that <
acpi/acpi_bus.h> be included prior to <acpi/acpi_drivers.h> so that theacpi_pci_rootdeclarations the latter depends on are always there. And <acpi/acpi.h> which provides basic ACPICA type declarations should always be included prior to any other ACPI headers inCONFIG_ACPIbuilds. That also is taken care of including <linux/acpi.h> as appropriate.Signed-off-by Lv Zheng <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Matthew Garrett <[email protected]>Cc Tony Luck <[email protected]>Cc "H. Peter Anvin" <[email protected]>--- arch/ia64/hp/common/aml_nfw.c | 3 +-- arch/x86/kernel/apic/apic_flat_64.c | 4 +--- arch/x86/kernel/apic/io_apic.c | 3 --- arch/x86/pci/mmconfig_32.c | 1 - arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-- drivers/acpi/ac.c | 3 +-- drivers/acpi/acpi_extlog.c | 1 - drivers/acpi/acpi_pad.c | 3 +-- drivers/acpi/apei/einj.c | 1 - drivers/acpi/battery.c | 3 +-- drivers/acpi/blacklist.c | 1 - drivers/acpi/bus.c | 2 -- drivers/acpi/button.c | 3 +-- drivers/acpi/custom_method.c | 2 +- drivers/acpi/debugfs.c | 2 +- drivers/acpi/dock.c | 2 -- drivers/acpi/ec.c | 5 ++--- drivers/acpi/event.c | 2 +- drivers/acpi/fan.c | 3 +-- drivers/acpi/hed.c | 2 -- drivers/acpi/numa.c | 1 - drivers/acpi/osl.c | 3 --- drivers/acpi/pci_irq.c | 2 -- drivers/acpi/pci_link.c | 4 +--- drivers/acpi/pci_root.c | 4 +--- drivers/acpi/power.c | 3 +-- drivers/acpi/proc.c | 4 +--- drivers/acpi/processor_core.c | 3 +-- drivers/acpi/processor_idle.c | 4 +--- drivers/acpi/processor_perflib.c | 7 ++----- drivers/acpi/processor_thermal.c | 7 ++----- drivers/acpi/processor_throttling.c | 7 ++----- drivers/acpi/sbshc.c | 3 +-- drivers/acpi/scan.c | 3 --- drivers/acpi/sleep.c | 4 ---- drivers/acpi/sysfs.c | 2 +- drivers/acpi/thermal.c | 5 ++--- drivers/acpi/utils.c | 2 -- drivers/acpi/video.c | 5 ++--- drivers/acpi/wakeup.c | 1 - drivers/ata/libata-acpi.c | 2 -- drivers/ata/pata_acpi.c | 5 ++--- drivers/char/hpet.c | 7 ++----- drivers/char/tpm/tpm_acpi.c | 2 +- drivers/char/tpm/tpm_ppi.c | 1 - drivers/gpu/drm/i915/intel_acpi.c | 2 -- drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +------ drivers/gpu/drm/radeon/radeon_acpi.c | 6 +----- drivers/hv/vmbus_drv.c | 2 -- drivers/hwmon/acpi_power_meter.c | 3 +-- drivers/hwmon/asus_atk0110.c | 6 +----- drivers/ide/ide-acpi.c | 1 - drivers/input/misc/atlas_btns.c | 2 +- drivers/iommu/amd_iommu_init.c | 1 - drivers/iommu/intel_irq_remapping.c | 4 ++-- drivers/pci/hotplug/acpiphp_ibm.c | 3 +-- drivers/pci/hotplug/pciehp.h | 2 -- drivers/pci/ioapic.c | 1 - drivers/pci/pci-acpi.c | 3 --- drivers/pci/pci-label.c | 1 - drivers/platform/x86/acer-wmi.c | 2 -- drivers/platform/x86/asus-laptop.c | 3 +-- drivers/platform/x86/asus-wmi.c | 3 +-- drivers/platform/x86/classmate-laptop.c | 3 +-- drivers/platform/x86/dell-wmi-aio.c | 1 - drivers/platform/x86/dell-wmi.c | 1 - drivers/platform/x86/eeepc-laptop.c | 3 +-- drivers/platform/x86/eeepc-wmi.c | 2 +- drivers/platform/x86/hp_accel.c | 2 +- drivers/platform/x86/ideapad-laptop.c | 3 +-- drivers/platform/x86/intel-rst.c | 2 +- drivers/platform/x86/intel-smartconnect.c | 2 +- drivers/platform/x86/intel_menlow.c | 4 +--- drivers/platform/x86/intel_oaktrail.c | 3 --- drivers/platform/x86/mxm-wmi.c | 3 +-- drivers/platform/x86/panasonic-laptop.c | 4 +--- drivers/platform/x86/pvpanic.c | 3 +-- drivers/platform/x86/samsung-q10.c | 2 +- drivers/platform/x86/sony-laptop.c | 4 +--- drivers/platform/x86/tc1100-wmi.c | 4 +--- drivers/platform/x86/thinkpad_acpi.c | 14 ++++---------- drivers/platform/x86/toshiba_acpi.c | 4 +--- drivers/platform/x86/toshiba_bluetooth.c | 4 +--- drivers/platform/x86/wmi.c | 2 -- drivers/platform/x86/xo15-ebook.c | 3 +-- drivers/pnp/pnpacpi/core.c | 1 - drivers/pnp/pnpacpi/pnpacpi.h | 1 - drivers/sfi/sfi_acpi.c | 2 +- drivers/staging/quickstart/quickstart.c | 2 +- drivers/usb/core/usb-acpi.c | 1 - drivers/xen/xen-acpi-cpuhotplug.c | 3 --- drivers/xen/xen-acpi-memhotplug.c | 1 - drivers/xen/xen-acpi-pad.c | 5 ++--- drivers/xen/xen-acpi-processor.c | 4 +--- include/acpi/acpi_bus.h | 2 -- include/acpi/acpi_drivers.h | 3 --- include/linux/acpi_io.h | 2 +- include/linux/ide.h | 8 ++------ include/linux/iscsi_ibft.h | 2 +- include/linux/pci_hotplug.h | 3 +-- include/linux/sfi_acpi.h | 2 +- include/linux/tboot.h | 2 +- tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 5 +---- 103 files changed, 80 insertions(+), 234 deletions(-)arch/ia64/hp/common/aml_nfw.c +1
-2@@ -23,8 +23,7 @@*/ #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/sal.h> MODULE_AUTHOR ("Bjorn Helgaas <[email protected]>" );arch/x86/kernel/apic/apic_flat_64.c +1
-3@@ -21,9 +21,7 @@#include <asm/apic.h> #include <asm/ipi.h> -#ifdef CONFIG_ACPI -#include <acpi/acpi_bus.h> -#endif +#include <linux/acpi.h> static struct apic apic_physflat;static struct apic apic_flat;arch/x86/kernel/apic/io_apic.c +0
-3@@ -37,9 +37,6 @@#include <linux/kthread.h> #include <linux/jiffies.h> /* time_after() */ #include <linux/slab.h> -#ifdef CONFIG_ACPI -#include <acpi/acpi_bus.h> -#endif #include <linux/bootmem.h> #include <linux/dmar.h> #include <linux/hpet.h> arch/x86/pci/mmconfig_32.c +0
-1@@ -14,7 +14,6 @@#include <linux/rcupdate.h> #include <asm/e820.h> #include <asm/pci_x86.h> -#include <acpi/acpi.h> /* Assume systems with more busses have correct MCFG */ #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))arch/x86/platform/olpc/olpc-xo15-sci.c +1
-2@@ -15,8 +15,7 @@#include <linux/power_supply.h> #include <linux/olpc-ec.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/olpc.h> #define DRV_NAME "olpc-xo15-sci"drivers/acpi/ac.c +1
-2@@ -32,8 +32,7 @@#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/power_supply.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/acpi_extlog.c +0
-1@@ -9,7 +9,6 @@#include <linux/module.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/cper.h> #include <linux/ratelimit.h> #include <asm/cpu.h> drivers/acpi/acpi_pad.c +1
-2@@ -28,8 +28,7 @@#include <linux/cpu.h> #include <linux/clockchips.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/mwait.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"drivers/acpi/apei/einj.c +0
-1@@ -33,7 +33,6 @@#include <linux/nmi.h> #include <linux/delay.h> #include <linux/mm.h> -#include <acpi/acpi.h> #include "apei-internal.h" drivers/acpi/battery.c +1
-2@@ -36,8 +36,7 @@#include <linux/suspend.h> #include <asm/unaligned.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/power_supply.h> #define PREFIX "ACPI: "drivers/acpi/blacklist.c +0
-1@@ -30,7 +30,6 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/dmi.h> #include "internal.h" drivers/acpi/bus.c +0
-2@@ -37,8 +37,6 @@#include <asm/mpspec.h> #endif #include <linux/pci.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h> #include <linux/dmi.h> #include <linux/suspend.h> drivers/acpi/button.c +1
-2@@ -31,8 +31,7 @@#include <linux/seq_file.h> #include <linux/input.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/button.h> #define PREFIX "ACPI: "drivers/acpi/custom_method.c +1
-1@@ -7,7 +7,7 @@#include <linux/kernel.h> #include <linux/uaccess.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h" drivers/acpi/debugfs.c +1
-1@@ -5,7 +5,7 @@#include <linux/export.h> #include <linux/init.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define _COMPONENT ACPI_SYSTEM_COMPONENTACPI_MODULE_NAME ("debugfs" );drivers/acpi/dock.c +0
-2@@ -32,8 +32,6 @@#include <linux/jiffies.h> #include <linux/stddef.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "drivers/acpi/ec.c +2
-3@@ -39,10 +39,9 @@#include <linux/list.h> #include <linux/spinlock.h> #include <linux/slab.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/dmi.h> +#include <asm/io.h> #include "internal.h" drivers/acpi/event.c +1
-1@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/poll.h> #include <linux/gfp.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <net/netlink.h> #include <net/genetlink.h> drivers/acpi/fan.c +1
-2@@ -29,8 +29,7 @@#include <linux/types.h> #include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/hed.c +0
-2@@ -25,8 +25,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/hed.h> static struct acpi_device_id acpi_hed_ids[] = {drivers/acpi/numa.c +0
-1@@ -29,7 +29,6 @@#include <linux/errno.h> #include <linux/acpi.h> #include <linux/numa.h> -#include <acpi/acpi_bus.h> #define PREFIX "ACPI: "drivers/acpi/osl.c +0
-3@@ -49,9 +49,6 @@#include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> #include "internal.h" #define _COMPONENT ACPI_OS_SERVICESdrivers/acpi/pci_irq.c +0
-2@@ -37,8 +37,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "drivers/acpi/pci_link.c +1
-3@@ -39,9 +39,7 @@#include <linux/pci.h> #include <linux/mutex.h> #include <linux/slab.h> - -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/pci_root.c +1
-3@@ -35,9 +35,7 @@#include <linux/pci-aspm.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/apei.h> +#include <acpi/apei.h> /* for acpi_hest_init() */ #include "internal.h" drivers/acpi/power.c +1
-2@@ -42,8 +42,7 @@#include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/sysfs.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "sleep.h" #include "internal.h" drivers/acpi/proc.c +1
-3@@ -3,11 +3,9 @@#include <linux/export.h> #include <linux/suspend.h> #include <linux/bcd.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "sleep.h" #define _COMPONENT ACPI_SYSTEM_COMPONENTdrivers/acpi/processor_core.c +1
-2@@ -10,8 +10,7 @@#include <linux/export.h> #include <linux/dmi.h> #include <linux/slab.h> - -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #include "internal.h" drivers/acpi/processor_idle.c +1
-3@@ -35,6 +35,7 @@#include <linux/clockchips.h> #include <linux/cpuidle.h> #include <linux/syscore_ops.h> +#include <acpi/processor.h> /* * Include the apic definitions for x86 to have the APIC timer related defines @@ -46,9 +47,6 @@#include <asm/apic.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/processor_perflib.c +2
-5@@ -31,15 +31,12 @@#include <linux/init.h> #include <linux/cpufreq.h> #include <linux/slab.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #ifdef CONFIG_X86 #include <asm/cpufeature.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/processor_thermal.c +2
-5@@ -30,12 +30,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/cpufreq.h> - -#include <asm/uaccess.h> - -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <acpi/acpi_drivers.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "drivers/acpi/processor_throttling.c +2
-5@@ -32,14 +32,11 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/cpufreq.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/sbshc.c +1
-2@@ -8,8 +8,7 @@* the Free Software Foundation version 2. */ -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/wait.h> #include <linux/slab.h> #include <linux/delay.h> drivers/acpi/scan.c +0
-2@@ -11,8 +11,6 @@#include <linux/kthread.h> #include <linux/dmi.h> #include <linux/nls.h> - -#include <acpi/acpi_drivers.h> #include "internal.h" drivers/acpi/sleep.c +0
-4@@ -18,12 +18,8 @@#include <linux/reboot.h> #include <linux/acpi.h> #include <linux/module.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "internal.h" #include "sleep.h" drivers/acpi/sysfs.c +1
-1@@ -5,7 +5,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/moduleparam.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h" drivers/acpi/thermal.c +2
-3@@ -41,10 +41,9 @@#include <linux/kmod.h> #include <linux/reboot.h> #include <linux/device.h> -#include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "drivers/acpi/utils.c +0
-2@@ -30,8 +30,6 @@#include <linux/types.h> #include <linux/hardirq.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include "internal.h" drivers/acpi/video.c +2
-3@@ -37,12 +37,11 @@#include <linux/pci.h> #include <linux/pci_ids.h> #include <linux/slab.h> -#include <asm/uaccess.h> #include <linux/dmi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <linux/suspend.h> +#include <linux/acpi.h> #include <acpi/video.h> +#include <asm/uaccess.h> #include "internal.h" drivers/acpi/wakeup.c +0
-1@@ -5,7 +5,6 @@#include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <linux/kernel.h> #include <linux/types.h> drivers/ata/libata-acpi.c +0
-2@@ -20,8 +20,6 @@#include <scsi/scsi_device.h> #include "libata.h" -#include <acpi/acpi_bus.h> -unsigned int ata_acpi_gtf_filter =ATA_ACPI_FILTER_DEFAULT ;module_param_named (acpi_gtf_filter, ata_acpi_gtf_filter, int,0644 ); MODULE_PARM_DESC(acpi_gtf_filter, "filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freezelock, 0x4=DIPM, 0x8=FPDMA non-zero offset, 0x10=FPDMA DMA Setup FIS auto-activate)");
drivers/ata/pata_acpi.c +2
-3@@ -12,11 +12,10 @@#include <linux/delay.h> #include <linux/device.h> #include <linux/gfp.h> -#include <scsi/scsi_host.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #include <linux/libata.h> #include <linux/ata.h> +#include <scsi/scsi_host.h> #define DRV_NAME "pata_acpi"#define DRV_VERSION "0.2.3"drivers/char/hpet.c +2
-5@@ -34,15 +34,12 @@#include <linux/uaccess.h> #include <linux/slab.h> #include <linux/io.h> - +#include <linux/acpi.h> +#include <linux/hpet.h> #include <asm/current.h> #include <asm/irq.h> #include <asm/div64.h> -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/hpet.h> -/* * The High Precision Event Timer driver. * This driver is closely modelled after the rtc.c driver. drivers/char/tpm/tpm_acpi.c +1
-1@@ -23,7 +23,7 @@#include <linux/security.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> #include "tpm.h" #include "tpm_eventlog.h" drivers/char/tpm/tpm_ppi.c +0
-1@@ -1,5 +1,4 @@#include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include "tpm.h" static const u8 tpm_ppi_uuid[] = {drivers/gpu/drm/i915/intel_acpi.c +0
-2@@ -6,8 +6,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/vga_switcheroo.h> -#include <acpi/acpi_drivers.h> -#include <drm/drmP.h> #include "i915_drv.h" drivers/gpu/drm/nouveau/nouveau_acpi.c +1
-6@@ -1,15 +1,10 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <acpi/video.h> -#include <acpi/acpi.h> #include <linux/mxm-wmi.h> -#include <linux/vga_switcheroo.h> -#include <drm/drm_edid.h> +#include <acpi/video.h> #include "nouveau_drm.h" #include "nouveau_acpi.h" drivers/gpu/drm/radeon/radeon_acpi.c +1
-5@@ -25,18 +25,14 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/power_supply.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/vga_switcheroo.h> #include <acpi/video.h> -#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> #include "radeon.h" #include "radeon_acpi.h" #include "atom.h" -#include <linux/vga_switcheroo.h> -#define ACPI_AC_CLASS "ac_adapter"extern void radeon_pm_acpi_event_handler (struct radeon_device *rdev);drivers/hv/vmbus_drv.c +0
-2@@ -30,7 +30,6 @@#include <linux/sysctl.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/completion.h> #include <linux/hyperv.h> #include <linux/kernel_stat.h> @@ -39,7 +38,6 @@#include <asm/mshyperv.h> #include "hyperv_vmbus.h" -static struct acpi_device *hv_acpi_dev;static struct tasklet_struct msg_dpc;drivers/hwmon/acpi_power_meter.c +1
-2@@ -30,8 +30,7 @@#include <linux/sched.h> #include <linux/time.h> #include <linux/err.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ACPI_POWER_METER_NAME "power_meter"ACPI_MODULE_NAME (ACPI_POWER_METER_NAME );drivers/hwmon/asus_atk0110.c +1
-6@@ -16,12 +16,7 @@#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/err.h> - -#include <acpi/acpi.h> -#include <acpi/acpixf.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #define ATK_HID "ATK0110"drivers/ide/ide-acpi.c +0
-1@@ -14,7 +14,6 @@#include <linux/errno.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <acpi/acpi.h> #include <linux/ide.h> #include <linux/pci.h> #include <linux/dmi.h> drivers/input/misc/atlas_btns.c +1
-1@@ -28,8 +28,8 @@#include <linux/init.h> #include <linux/input.h> #include <linux/types.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> #define ACPI_ATLAS_NAME "Atlas ACPI"#define ACPI_ATLAS_CLASS "Atlas"drivers/iommu/amd_iommu_init.c +0
-1@@ -26,7 +26,6 @@#include <linux/msi.h> #include <linux/amd-iommu.h> #include <linux/export.h> -#include <acpi/acpi.h> #include <asm/pci-direct.h> #include <asm/iommu.h> #include <asm/gart.h> drivers/iommu/intel_irq_remapping.c +2
-2@@ -6,11 +6,11 @@#include <linux/hpet.h> #include <linux/pci.h> #include <linux/irq.h> +#include <linux/intel-iommu.h> +#include <linux/acpi.h> #include <asm/io_apic.h> #include <asm/smp.h> #include <asm/cpu.h> -#include <linux/intel-iommu.h> -#include <acpi/acpi.h> #include <asm/irq_remapping.h> #include <asm/pci-direct.h> #include <asm/msidef.h> drivers/pci/hotplug/acpiphp_ibm.c +1
-2@@ -31,12 +31,11 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> -#include <acpi/acpi_bus.h> #include <linux/sysfs.h> #include <linux/kobject.h> -#include <asm/uaccess.h> #include <linux/moduleparam.h> #include <linux/pci.h> +#include <asm/uaccess.h> #include "acpiphp.h" #include "../pci.h" drivers/pci/hotplug/pciehp.h +0
-2@@ -163,8 +163,6 @@ static inline const char *slot_name(struct slot *slot) }#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/pci-acpi.h> void __init pciehp_acpi_slot_detection_init (void );drivers/pci/ioapic.c +0
-1@@ -20,7 +20,6 @@#include <linux/module.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> struct ioapic {acpi_handle handle;drivers/pci/pci-acpi.c +0
-3@@ -12,9 +12,6 @@#include <linux/pci.h> #include <linux/module.h> #include <linux/pci-aspm.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/pci-acpi.h> #include <linux/pm_runtime.h> #include <linux/pm_qos.h> drivers/pci/pci-label.c +0
-1@@ -29,7 +29,6 @@#include <linux/nls.h> #include <linux/acpi.h> #include <linux/pci-acpi.h> -#include <acpi/acpi_bus.h> #include "pci.h" #define DEVICE_LABEL_DSM 0x07drivers/platform/x86/acer-wmi.c +0
-2@@ -41,8 +41,6 @@#include <linux/slab.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> - -#include <acpi/acpi_drivers.h> #include <acpi/video.h> MODULE_AUTHOR ("Carlos Corbacho" );drivers/platform/x86/asus-laptop.c +1
-2@@ -53,8 +53,7 @@#include <linux/rfkill.h> #include <linux/slab.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ASUS_LAPTOP_VERSION "0.42"drivers/platform/x86/asus-wmi.c +1
-2@@ -45,8 +45,7 @@#include <linux/seq_file.h> #include <linux/platform_device.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/video.h> #include "asus-wmi.h" drivers/platform/x86/classmate-laptop.c +1
-2@@ -21,14 +21,13 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/workqueue.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/backlight.h> #include <linux/input.h> #include <linux/rfkill.h> MODULE_LICENSE ("GPL" ); -struct cmpc_accel {int sensitivity;int g_select;drivers/platform/x86/dell-wmi-aio.c +0
-1@@ -24,7 +24,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> drivers/platform/x86/dell-wmi.c +0
-1@@ -32,7 +32,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> #include <linux/dmi.h> drivers/platform/x86/eeepc-laptop.c +1
-2@@ -28,8 +28,7 @@#include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <linux/uaccess.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> drivers/platform/x86/eeepc-wmi.c +1
-1@@ -33,7 +33,7 @@#include <linux/input/sparse-keymap.h> #include <linux/dmi.h> #include <linux/fb.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include "asus-wmi.h" drivers/platform/x86/hp_accel.c +1
-1@@ -36,7 +36,7 @@#include <linux/uaccess.h> #include <linux/leds.h> #include <linux/atomic.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "../../misc/lis3lv02d/lis3lv02d.h" #define DRIVER_NAME "hp_accel"drivers/platform/x86/ideapad-laptop.c +1
-2@@ -26,8 +26,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/platform_device.h> #include <linux/input.h> drivers/platform/x86/intel-rst.c +1
-1@@ -20,7 +20,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );drivers/platform/x86/intel-smartconnect.c +1
-1@@ -19,7 +19,7 @@#include <linux/init.h> #include <linux/module.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );drivers/platform/x86/intel_menlow.c +1
-3@@ -36,10 +36,8 @@#include <linux/types.h> #include <linux/pci.h> #include <linux/pm.h> -#include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Thomas Sujith" );MODULE_AUTHOR ("Zhang Rui" );drivers/platform/x86/intel_oaktrail.c +0
-3@@ -50,9 +50,6 @@#include <linux/platform_device.h> #include <linux/dmi.h> #include <linux/rfkill.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#define DRIVER_NAME "intel_oaktrail"#define DRIVER_VERSION "0.4ac1"drivers/platform/x86/mxm-wmi.c +1
-2@@ -20,8 +20,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Dave Airlie" );MODULE_DESCRIPTION ("MXM WMI Driver" );drivers/platform/x86/panasonic-laptop.c +1
-3@@ -125,12 +125,10 @@#include <linux/seq_file.h> #include <linux/uaccess.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#ifndef ACPI_HOTKEY_COMPONENT #define ACPI_HOTKEY_COMPONENT 0x10000000#endif drivers/platform/x86/pvpanic.c +1
-2@@ -24,8 +24,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Hu Tao <[email protected]>" );MODULE_DESCRIPTION ("pvpanic device driver" );drivers/platform/x86/samsung-q10.c +1
-1@@ -15,7 +15,7 @@#include <linux/platform_device.h> #include <linux/backlight.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define SAMSUNGQ10_BL_MAX_INTENSITY 7drivers/platform/x86/sony-laptop.c +1
-3@@ -61,9 +61,6 @@#include <linux/workqueue.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <asm/uaccess.h> #include <linux/sonypi.h> #include <linux/sony-laptop.h> #include <linux/rfkill.h> @@ -71,6 +68,7 @@#include <linux/poll.h> #include <linux/miscdevice.h> #endif +#include <asm/uaccess.h> #define dprintk (fmt, ...) \ do { \drivers/platform/x86/tc1100-wmi.c +1
-3@@ -32,9 +32,7 @@#include <linux/slab.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #define GUID "C364AC71-36DB-495A-8494-B439D472A505"drivers/platform/x86/thinkpad_acpi.c +4
-10@@ -61,7 +61,6 @@#include <linux/freezer.h> #include <linux/delay.h> #include <linux/slab.h> -#include <linux/nvram.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> @@ -74,21 +73,16 @@#include <linux/input.h> #include <linux/leds.h> #include <linux/rfkill.h> -#include <asm/uaccess.h> -#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/workqueue.h> - +#include <linux/acpi.h> +#include <linux/pci_ids.h> +#include <linux/thinkpad_acpi.h> #include <sound/core.h> #include <sound/control.h> #include <sound/initval.h> - -#include <acpi/acpi_drivers.h> - -#include <linux/pci_ids.h> - -#include <linux/thinkpad_acpi.h> +#include <asm/uaccess.h> /* ThinkPad CMOS commands */ #define TP_CMOS_VOLUME_DOWN 0drivers/platform/x86/toshiba_acpi.c +1
-3@@ -54,11 +54,9 @@#include <linux/slab.h> #include <linux/workqueue.h> #include <linux/i8042.h> - +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> -MODULE_AUTHOR ("John Belmonte" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Extras Driver" );MODULE_LICENSE ("GPL" );drivers/platform/x86/toshiba_bluetooth.c +1
-3@@ -23,14 +23,12 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Jes Sorensen <[email protected]>" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Bluetooth Enable Driver" );MODULE_LICENSE ("GPL" ); -static int toshiba_bt_rfkill_add (struct acpi_device *device);static int toshiba_bt_rfkill_remove (struct acpi_device *device);static void toshiba_bt_rfkill_notify (struct acpi_device *device,u32 event);drivers/platform/x86/wmi.c +0
-2@@ -37,8 +37,6 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> ACPI_MODULE_NAME ("wmi" );MODULE_AUTHOR ("Carlos Corbacho" );drivers/platform/x86/xo15-ebook.c +1
-2@@ -18,8 +18,7 @@#include <linux/init.h> #include <linux/types.h> #include <linux/input.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define MODULE_NAME "xo15-ebook"drivers/pnp/pnpacpi/core.c +0
-1@@ -24,7 +24,6 @@#include <linux/pnp.h> #include <linux/slab.h> #include <linux/mod_devicetable.h> -#include <acpi/acpi_bus.h> #include "../base.h" #include "pnpacpi.h" drivers/pnp/pnpacpi/pnpacpi.h +0
-1@@ -1,7 +1,6 @@#ifndef ACPI_PNP_H #define ACPI_PNP_H -#include <acpi/acpi_bus.h> #include <linux/acpi.h> #include <linux/pnp.h> drivers/sfi/sfi_acpi.c +1
-1@@ -60,7 +60,7 @@#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt#include <linux/kernel.h> -#include <acpi/acpi.h> +#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ #include <linux/sfi.h> #include "sfi_core.h" drivers/staging/quickstart/quickstart.c +1
-1@@ -31,7 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #include <linux/input.h> drivers/usb/core/usb-acpi.c +0
-1@@ -16,7 +16,6 @@#include <linux/acpi.h> #include <linux/pci.h> #include <linux/usb/hcd.h> -#include <acpi/acpi_bus.h> #include "usb.h" drivers/xen/xen-acpi-cpuhotplug.c +0
-3@@ -24,10 +24,7 @@#include <linux/cpu.h> #include <linux/acpi.h> #include <linux/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/processor.h> -#include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> drivers/xen/xen-acpi-memhotplug.c +0
-1@@ -22,7 +22,6 @@#include <linux/init.h> #include <linux/types.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> drivers/xen/xen-acpi-pad.c +2
-3@@ -18,11 +18,10 @@#include <linux/kernel.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <asm/xen/hypercall.h> +#include <linux/acpi.h> #include <xen/interface/version.h> #include <xen/xen-ops.h> +#include <asm/xen/hypercall.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"drivers/xen/xen-acpi-processor.c +1
-3@@ -28,10 +28,8 @@#include <linux/module.h> #include <linux/types.h> #include <linux/syscore_ops.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <xen/xen.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> include/acpi/acpi_bus.h +0
-2@@ -28,8 +28,6 @@#include <linux/device.h> -#include <acpi/acpi.h> -/* TBD: Make dynamic */ #define ACPI_MAX_HANDLES 10struct acpi_handle_list {include/acpi/acpi_drivers.h +0
-3@@ -26,9 +26,6 @@#ifndef __ACPI_DRIVERS_H__#define __ACPI_DRIVERS_H__ -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#define ACPI_MAX_STRING 80/* include/linux/acpi_io.h +1
-1@@ -2,7 +2,7 @@#define _ACPI_IO_H_#include <linux/io.h> -#include <acpi/acpi.h> +#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys,acpi_size size)include/linux/ide.h +2
-6@@ -18,14 +18,10 @@#include <linux/completion.h> #include <linux/pm.h> #include <linux/mutex.h> -#ifdef CONFIG_BLK_DEV_IDEACPI -#include <acpi/acpi.h> -#endif -#include <asm/byteorder.h> -#include <asm/io.h> -/* for request_sense */ #include <linux/cdrom.h> +#include <asm/byteorder.h> +#include <asm/io.h> #if defined(CONFIG_CRIS ) || defined(CONFIG_FRV ) || defined(CONFIG_MN10300 )# define SUPPORT_VLB_SYNC 0include/linux/iscsi_ibft.h +1
-1@@ -21,7 +21,7 @@#ifndef ISCSI_IBFT_H #define ISCSI_IBFT_H -#include <acpi/acpi.h> +#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ /* * Logical location of iSCSI Boot Format Table. include/linux/pci_hotplug.h +1
-2@@ -175,8 +175,7 @@ struct hotplug_params { };#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> int pci_get_hp_params (struct pci_dev *dev,struct hotplug_params *hpp);int acpi_get_hp_hw_control_from_firmware (struct pci_dev *dev,u32 flags);int acpi_pci_check_ejectable (struct pci_bus *pbus,acpi_handle handle);include/linux/sfi_acpi.h +1
-1@@ -60,7 +60,7 @@#define _LINUX_SFI_ACPI_H#ifdef CONFIG_SFI -#include <acpi/acpi.h> /* struct acpi_table_header */ +#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ extern int sfi_acpi_table_parse(char *signature, char *oem_id, char *oem_table_id,include/linux/tboot.h +1
-1@@ -34,7 +34,7 @@ enum { };#ifdef CONFIG_INTEL_TXT -#include <acpi/acpi.h> +#include <linux/acpi.h> /* used to communicate between tboot and the launched kernel */ #define TB_KEY_SIZE 64/* 512 bits */ tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +1
-5@@ -25,12 +25,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/delay.h> - +#include <linux/acpi.h> #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -static int pm_tmr_ioport =0 ;/*helper function to safely read acpi pm timesource*/ --1.7.10
Re: [PATCH v2] ACPI: Cleanup <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
In reply to Lv ZhengQuoted 29 lines · Lv Zheng
Replace direct inclusions of <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions.First of all, <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> should not be included directly from any files that are built forCONFIG_ACPIunset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. ForCONFIG_ACPIset, <linux/acpi.h> includes those files and for !CONFIG_ACPI it provides stub ACPI symbols to be used in that case.Second, there are ordering dependencies between those files that always have to be met. Namely, it is required that <
acpi/acpi_bus.h> be included prior to <acpi/acpi_drivers.h> so that theacpi_pci_rootdeclarations the latter depends on are always there. And <acpi/acpi.h> which provides basic ACPICA type declarations should always be included prior to any other ACPI headers inCONFIG_ACPIbuilds. That also is taken care of including <linux/acpi.h> as appropriate.This patch also includes necessary cleanups in the affected files where other ACPI headers is also included but not referenced.
Known issues:
1. No cleanups on other <acpi/xxx.h> inclusions.
There are <acpi/xxx.h> like <acpi/processor.h>, <acpi/video.h> could be elevated as <linux/acpi_xxx.h> candidates and include <linux/acpi.h> in them. So that we can cleanup more duplicated inclusions. This patch doesn't perform such cleanups yet. They are going to be done in seperate series after discussion.
Quoted 1 line
Signed-off-by Lv Zheng <[email protected]>
Quoted 1,659 lines
--- arch/ia64/hp/common/aml_nfw.c | 3 +-- arch/x86/kernel/apic/apic_flat_64.c | 4 +--- arch/x86/kernel/apic/io_apic.c | 3 --- arch/x86/pci/mmconfig_32.c | 1 - arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-- drivers/acpi/ac.c | 3 +-- drivers/acpi/acpi_extlog.c | 1 - drivers/acpi/acpi_pad.c | 3 +-- drivers/acpi/apei/einj.c | 1 - drivers/acpi/battery.c | 3 +-- drivers/acpi/blacklist.c | 1 - drivers/acpi/bus.c | 2 -- drivers/acpi/button.c | 3 +-- drivers/acpi/custom_method.c | 2 +- drivers/acpi/debugfs.c | 2 +- drivers/acpi/dock.c | 2 -- drivers/acpi/ec.c | 5 ++--- drivers/acpi/event.c | 2 +- drivers/acpi/fan.c | 3 +-- drivers/acpi/hed.c | 2 -- drivers/acpi/numa.c | 1 - drivers/acpi/osl.c | 3 --- drivers/acpi/pci_irq.c | 2 -- drivers/acpi/pci_link.c | 4 +--- drivers/acpi/pci_root.c | 4 +--- drivers/acpi/power.c | 3 +-- drivers/acpi/proc.c | 4 +--- drivers/acpi/processor_core.c | 3 +-- drivers/acpi/processor_idle.c | 4 +--- drivers/acpi/processor_perflib.c | 7 ++----- drivers/acpi/processor_thermal.c | 7 ++----- drivers/acpi/processor_throttling.c | 7 ++----- drivers/acpi/sbshc.c | 3 +-- drivers/acpi/scan.c | 3 --- drivers/acpi/sleep.c | 4 ---- drivers/acpi/sysfs.c | 2 +- drivers/acpi/thermal.c | 5 ++--- drivers/acpi/utils.c | 2 -- drivers/acpi/video.c | 5 ++--- drivers/acpi/wakeup.c | 1 - drivers/ata/libata-acpi.c | 2 -- drivers/ata/pata_acpi.c | 5 ++--- drivers/char/hpet.c | 7 ++----- drivers/char/tpm/tpm_acpi.c | 2 +- drivers/char/tpm/tpm_ppi.c | 1 - drivers/gpu/drm/i915/intel_acpi.c | 2 -- drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +------ drivers/gpu/drm/radeon/radeon_acpi.c | 6 +----- drivers/hv/vmbus_drv.c | 2 -- drivers/hwmon/acpi_power_meter.c | 3 +-- drivers/hwmon/asus_atk0110.c | 6 +----- drivers/ide/ide-acpi.c | 1 - drivers/input/misc/atlas_btns.c | 2 +- drivers/iommu/amd_iommu_init.c | 1 - drivers/iommu/intel_irq_remapping.c | 4 ++-- drivers/pci/hotplug/acpiphp_ibm.c | 3 +-- drivers/pci/hotplug/pciehp.h | 2 -- drivers/pci/ioapic.c | 1 - drivers/pci/pci-acpi.c | 3 --- drivers/pci/pci-label.c | 1 - drivers/platform/x86/acer-wmi.c | 2 -- drivers/platform/x86/asus-laptop.c | 3 +-- drivers/platform/x86/asus-wmi.c | 3 +-- drivers/platform/x86/classmate-laptop.c | 3 +-- drivers/platform/x86/dell-wmi-aio.c | 1 - drivers/platform/x86/dell-wmi.c | 1 - drivers/platform/x86/eeepc-laptop.c | 3 +-- drivers/platform/x86/eeepc-wmi.c | 2 +- drivers/platform/x86/hp_accel.c | 2 +- drivers/platform/x86/ideapad-laptop.c | 3 +-- drivers/platform/x86/intel-rst.c | 2 +- drivers/platform/x86/intel-smartconnect.c | 2 +- drivers/platform/x86/intel_menlow.c | 4 +--- drivers/platform/x86/intel_oaktrail.c | 3 --- drivers/platform/x86/mxm-wmi.c | 3 +-- drivers/platform/x86/panasonic-laptop.c | 4 +--- drivers/platform/x86/pvpanic.c | 3 +-- drivers/platform/x86/samsung-q10.c | 2 +- drivers/platform/x86/sony-laptop.c | 4 +--- drivers/platform/x86/tc1100-wmi.c | 4 +--- drivers/platform/x86/thinkpad_acpi.c | 14 ++++---------- drivers/platform/x86/toshiba_acpi.c | 4 +--- drivers/platform/x86/toshiba_bluetooth.c | 4 +--- drivers/platform/x86/wmi.c | 2 -- drivers/platform/x86/xo15-ebook.c | 3 +-- drivers/pnp/pnpacpi/core.c | 1 - drivers/pnp/pnpacpi/pnpacpi.h | 1 - drivers/sfi/sfi_acpi.c | 3 +-- drivers/staging/quickstart/quickstart.c | 2 +- drivers/usb/core/usb-acpi.c | 1 - drivers/xen/xen-acpi-cpuhotplug.c | 3 --- drivers/xen/xen-acpi-memhotplug.c | 1 - drivers/xen/xen-acpi-pad.c | 5 ++--- drivers/xen/xen-acpi-processor.c | 4 +--- include/acpi/acpi_bus.h | 2 -- include/acpi/acpi_drivers.h | 3 --- include/linux/acpi_io.h | 2 +- include/linux/ide.h | 8 ++------ include/linux/iscsi_ibft.h | 2 +- include/linux/pci_hotplug.h | 3 +-- include/linux/sfi_acpi.h | 2 +- include/linux/tboot.h | 2 +- tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 5 +---- 103 files changed, 80 insertions(+), 235 deletions(-)arch/ia64/hp/common/aml_nfw.c +1
-2@@ -23,8 +23,7 @@*/ #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/sal.h> MODULE_AUTHOR ("Bjorn Helgaas <[email protected]>" );arch/x86/kernel/apic/apic_flat_64.c +1
-3@@ -21,9 +21,7 @@#include <asm/apic.h> #include <asm/ipi.h> -#ifdef CONFIG_ACPI -#include <acpi/acpi_bus.h> -#endif +#include <linux/acpi.h> static struct apic apic_physflat;static struct apic apic_flat;arch/x86/kernel/apic/io_apic.c +0
-3@@ -37,9 +37,6 @@#include <linux/kthread.h> #include <linux/jiffies.h> /* time_after() */ #include <linux/slab.h> -#ifdef CONFIG_ACPI -#include <acpi/acpi_bus.h> -#endif #include <linux/bootmem.h> #include <linux/dmar.h> #include <linux/hpet.h> arch/x86/pci/mmconfig_32.c +0
-1@@ -14,7 +14,6 @@#include <linux/rcupdate.h> #include <asm/e820.h> #include <asm/pci_x86.h> -#include <acpi/acpi.h> /* Assume systems with more busses have correct MCFG */ #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))arch/x86/platform/olpc/olpc-xo15-sci.c +1
-2@@ -15,8 +15,7 @@#include <linux/power_supply.h> #include <linux/olpc-ec.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/olpc.h> #define DRV_NAME "olpc-xo15-sci"drivers/acpi/ac.c +1
-2@@ -32,8 +32,7 @@#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/power_supply.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/acpi_extlog.c +0
-1@@ -9,7 +9,6 @@#include <linux/module.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/cper.h> #include <linux/ratelimit.h> #include <asm/cpu.h> drivers/acpi/acpi_pad.c +1
-2@@ -28,8 +28,7 @@#include <linux/cpu.h> #include <linux/clockchips.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/mwait.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"drivers/acpi/apei/einj.c +0
-1@@ -33,7 +33,6 @@#include <linux/nmi.h> #include <linux/delay.h> #include <linux/mm.h> -#include <acpi/acpi.h> #include "apei-internal.h" drivers/acpi/battery.c +1
-2@@ -36,8 +36,7 @@#include <linux/suspend.h> #include <asm/unaligned.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/power_supply.h> #define PREFIX "ACPI: "drivers/acpi/blacklist.c +0
-1@@ -30,7 +30,6 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/dmi.h> #include "internal.h" drivers/acpi/bus.c +0
-2@@ -37,8 +37,6 @@#include <asm/mpspec.h> #endif #include <linux/pci.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h> #include <linux/dmi.h> #include <linux/suspend.h> drivers/acpi/button.c +1
-2@@ -31,8 +31,7 @@#include <linux/seq_file.h> #include <linux/input.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/button.h> #define PREFIX "ACPI: "drivers/acpi/custom_method.c +1
-1@@ -7,7 +7,7 @@#include <linux/kernel.h> #include <linux/uaccess.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h" drivers/acpi/debugfs.c +1
-1@@ -5,7 +5,7 @@#include <linux/export.h> #include <linux/init.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define _COMPONENT ACPI_SYSTEM_COMPONENTACPI_MODULE_NAME ("debugfs" );drivers/acpi/dock.c +0
-2@@ -32,8 +32,6 @@#include <linux/jiffies.h> #include <linux/stddef.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "drivers/acpi/ec.c +2
-3@@ -39,10 +39,9 @@#include <linux/list.h> #include <linux/spinlock.h> #include <linux/slab.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/dmi.h> +#include <asm/io.h> #include "internal.h" drivers/acpi/event.c +1
-1@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/poll.h> #include <linux/gfp.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <net/netlink.h> #include <net/genetlink.h> drivers/acpi/fan.c +1
-2@@ -29,8 +29,7 @@#include <linux/types.h> #include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/hed.c +0
-2@@ -25,8 +25,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/hed.h> static struct acpi_device_id acpi_hed_ids[] = {drivers/acpi/numa.c +0
-1@@ -29,7 +29,6 @@#include <linux/errno.h> #include <linux/acpi.h> #include <linux/numa.h> -#include <acpi/acpi_bus.h> #define PREFIX "ACPI: "drivers/acpi/osl.c +0
-3@@ -49,9 +49,6 @@#include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> #include "internal.h" #define _COMPONENT ACPI_OS_SERVICESdrivers/acpi/pci_irq.c +0
-2@@ -37,8 +37,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "drivers/acpi/pci_link.c +1
-3@@ -39,9 +39,7 @@#include <linux/pci.h> #include <linux/mutex.h> #include <linux/slab.h> - -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "drivers/acpi/pci_root.c +1
-3@@ -35,9 +35,7 @@#include <linux/pci-aspm.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/apei.h> +#include <acpi/apei.h> /* for acpi_hest_init() */ #include "internal.h" drivers/acpi/power.c +1
-2@@ -42,8 +42,7 @@#include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/sysfs.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "sleep.h" #include "internal.h" drivers/acpi/proc.c +1
-3@@ -3,11 +3,9 @@#include <linux/export.h> #include <linux/suspend.h> #include <linux/bcd.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "sleep.h" #define _COMPONENT ACPI_SYSTEM_COMPONENTdrivers/acpi/processor_core.c +1
-2@@ -10,8 +10,7 @@#include <linux/export.h> #include <linux/dmi.h> #include <linux/slab.h> - -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #include "internal.h" drivers/acpi/processor_idle.c +1
-3@@ -35,6 +35,7 @@#include <linux/clockchips.h> #include <linux/cpuidle.h> #include <linux/syscore_ops.h> +#include <acpi/processor.h> /* * Include the apic definitions for x86 to have the APIC timer related defines @@ -46,9 +47,6 @@#include <asm/apic.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/processor_perflib.c +2
-5@@ -31,15 +31,12 @@#include <linux/init.h> #include <linux/cpufreq.h> #include <linux/slab.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #ifdef CONFIG_X86 #include <asm/cpufeature.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/processor_thermal.c +2
-5@@ -30,12 +30,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/cpufreq.h> - -#include <asm/uaccess.h> - -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <acpi/acpi_drivers.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "drivers/acpi/processor_throttling.c +2
-5@@ -32,14 +32,11 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/cpufreq.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"drivers/acpi/sbshc.c +1
-2@@ -8,8 +8,7 @@* the Free Software Foundation version 2. */ -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/wait.h> #include <linux/slab.h> #include <linux/delay.h> drivers/acpi/scan.c +0
-3@@ -11,9 +11,6 @@#include <linux/kthread.h> #include <linux/dmi.h> #include <linux/nls.h> - -#include <acpi/acpi_drivers.h> -#include <asm/pgtable.h> #include "internal.h" drivers/acpi/sleep.c +0
-4@@ -18,12 +18,8 @@#include <linux/reboot.h> #include <linux/acpi.h> #include <linux/module.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "internal.h" #include "sleep.h" drivers/acpi/sysfs.c +1
-1@@ -5,7 +5,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/moduleparam.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h" drivers/acpi/thermal.c +2
-3@@ -41,10 +41,9 @@#include <linux/kmod.h> #include <linux/reboot.h> #include <linux/device.h> -#include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "drivers/acpi/utils.c +0
-2@@ -30,8 +30,6 @@#include <linux/types.h> #include <linux/hardirq.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include "internal.h" drivers/acpi/video.c +2
-3@@ -37,12 +37,11 @@#include <linux/pci.h> #include <linux/pci_ids.h> #include <linux/slab.h> -#include <asm/uaccess.h> #include <linux/dmi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <linux/suspend.h> +#include <linux/acpi.h> #include <acpi/video.h> +#include <asm/uaccess.h> #include "internal.h" drivers/acpi/wakeup.c +0
-1@@ -5,7 +5,6 @@#include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <linux/kernel.h> #include <linux/types.h> drivers/ata/libata-acpi.c +0
-2@@ -20,8 +20,6 @@#include <scsi/scsi_device.h> #include "libata.h" -#include <acpi/acpi_bus.h> -unsigned int ata_acpi_gtf_filter =ATA_ACPI_FILTER_DEFAULT ;module_param_named (acpi_gtf_filter, ata_acpi_gtf_filter, int,0644 );MODULE_PARM_DESC (acpi_gtf_filter,"filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freeze lock, 0x4=DIPM, 0x8=FPDMA non-zero offset, 0x10=FPDMA DMA Setup FIS auto-activate)" );drivers/ata/pata_acpi.c +2
-3@@ -12,11 +12,10 @@#include <linux/delay.h> #include <linux/device.h> #include <linux/gfp.h> -#include <scsi/scsi_host.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #include <linux/libata.h> #include <linux/ata.h> +#include <scsi/scsi_host.h> #define DRV_NAME "pata_acpi"#define DRV_VERSION "0.2.3"drivers/char/hpet.c +2
-5@@ -34,15 +34,12 @@#include <linux/uaccess.h> #include <linux/slab.h> #include <linux/io.h> - +#include <linux/acpi.h> +#include <linux/hpet.h> #include <asm/current.h> #include <asm/irq.h> #include <asm/div64.h> -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/hpet.h> -/* * The High Precision Event Timer driver. * This driver is closely modelled after the rtc.c driver. drivers/char/tpm/tpm_acpi.c +1
-1@@ -23,7 +23,7 @@#include <linux/security.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> #include "tpm.h" #include "tpm_eventlog.h" drivers/char/tpm/tpm_ppi.c +0
-1@@ -1,5 +1,4 @@#include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include "tpm.h" static const u8 tpm_ppi_uuid[] = {drivers/gpu/drm/i915/intel_acpi.c +0
-2@@ -6,8 +6,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/vga_switcheroo.h> -#include <acpi/acpi_drivers.h> -#include <drm/drmP.h> #include "i915_drv.h" drivers/gpu/drm/nouveau/nouveau_acpi.c +1
-6@@ -1,15 +1,10 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <acpi/video.h> -#include <acpi/acpi.h> #include <linux/mxm-wmi.h> -#include <linux/vga_switcheroo.h> -#include <drm/drm_edid.h> +#include <acpi/video.h> #include "nouveau_drm.h" #include "nouveau_acpi.h" drivers/gpu/drm/radeon/radeon_acpi.c +1
-5@@ -25,18 +25,14 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/power_supply.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/vga_switcheroo.h> #include <acpi/video.h> -#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> #include "radeon.h" #include "radeon_acpi.h" #include "atom.h" -#include <linux/vga_switcheroo.h> -#define ACPI_AC_CLASS "ac_adapter"extern void radeon_pm_acpi_event_handler (struct radeon_device *rdev);drivers/hv/vmbus_drv.c +0
-2@@ -30,7 +30,6 @@#include <linux/sysctl.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/completion.h> #include <linux/hyperv.h> #include <linux/kernel_stat.h> @@ -39,7 +38,6 @@#include <asm/mshyperv.h> #include "hyperv_vmbus.h" -static struct acpi_device *hv_acpi_dev;static struct tasklet_struct msg_dpc;drivers/hwmon/acpi_power_meter.c +1
-2@@ -30,8 +30,7 @@#include <linux/sched.h> #include <linux/time.h> #include <linux/err.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ACPI_POWER_METER_NAME "power_meter"ACPI_MODULE_NAME (ACPI_POWER_METER_NAME );drivers/hwmon/asus_atk0110.c +1
-5@@ -16,11 +16,7 @@#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/err.h> - -#include <acpi/acpi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #define ATK_HID "ATK0110"drivers/ide/ide-acpi.c +0
-1@@ -14,7 +14,6 @@#include <linux/errno.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <acpi/acpi.h> #include <linux/ide.h> #include <linux/pci.h> #include <linux/dmi.h> drivers/input/misc/atlas_btns.c +1
-1@@ -28,8 +28,8 @@#include <linux/init.h> #include <linux/input.h> #include <linux/types.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> #define ACPI_ATLAS_NAME "Atlas ACPI"#define ACPI_ATLAS_CLASS "Atlas"drivers/iommu/amd_iommu_init.c +0
-1@@ -26,7 +26,6 @@#include <linux/msi.h> #include <linux/amd-iommu.h> #include <linux/export.h> -#include <acpi/acpi.h> #include <asm/pci-direct.h> #include <asm/iommu.h> #include <asm/gart.h> drivers/iommu/intel_irq_remapping.c +2
-2@@ -6,11 +6,11 @@#include <linux/hpet.h> #include <linux/pci.h> #include <linux/irq.h> +#include <linux/intel-iommu.h> +#include <linux/acpi.h> #include <asm/io_apic.h> #include <asm/smp.h> #include <asm/cpu.h> -#include <linux/intel-iommu.h> -#include <acpi/acpi.h> #include <asm/irq_remapping.h> #include <asm/pci-direct.h> #include <asm/msidef.h> drivers/pci/hotplug/acpiphp_ibm.c +1
-2@@ -31,12 +31,11 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> -#include <acpi/acpi_bus.h> #include <linux/sysfs.h> #include <linux/kobject.h> -#include <asm/uaccess.h> #include <linux/moduleparam.h> #include <linux/pci.h> +#include <asm/uaccess.h> #include "acpiphp.h" #include "../pci.h" drivers/pci/hotplug/pciehp.h +0
-2@@ -163,8 +163,6 @@ static inline const char *slot_name(struct slot *slot) }#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/pci-acpi.h> void __init pciehp_acpi_slot_detection_init (void );drivers/pci/ioapic.c +0
-1@@ -20,7 +20,6 @@#include <linux/module.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> struct ioapic {acpi_handle handle;drivers/pci/pci-acpi.c +0
-3@@ -12,9 +12,6 @@#include <linux/pci.h> #include <linux/module.h> #include <linux/pci-aspm.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/pci-acpi.h> #include <linux/pm_runtime.h> #include <linux/pm_qos.h> drivers/pci/pci-label.c +0
-1@@ -29,7 +29,6 @@#include <linux/nls.h> #include <linux/acpi.h> #include <linux/pci-acpi.h> -#include <acpi/acpi_bus.h> #include "pci.h" #define DEVICE_LABEL_DSM 0x07drivers/platform/x86/acer-wmi.c +0
-2@@ -41,8 +41,6 @@#include <linux/slab.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> - -#include <acpi/acpi_drivers.h> #include <acpi/video.h> MODULE_AUTHOR ("Carlos Corbacho" );drivers/platform/x86/asus-laptop.c +1
-2@@ -53,8 +53,7 @@#include <linux/rfkill.h> #include <linux/slab.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ASUS_LAPTOP_VERSION "0.42"drivers/platform/x86/asus-wmi.c +1
-2@@ -45,8 +45,7 @@#include <linux/seq_file.h> #include <linux/platform_device.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/video.h> #include "asus-wmi.h" drivers/platform/x86/classmate-laptop.c +1
-2@@ -21,14 +21,13 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/workqueue.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/backlight.h> #include <linux/input.h> #include <linux/rfkill.h> MODULE_LICENSE ("GPL" ); -struct cmpc_accel {int sensitivity;int g_select;drivers/platform/x86/dell-wmi-aio.c +0
-1@@ -24,7 +24,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> drivers/platform/x86/dell-wmi.c +0
-1@@ -32,7 +32,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> #include <linux/dmi.h> drivers/platform/x86/eeepc-laptop.c +1
-2@@ -28,8 +28,7 @@#include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <linux/uaccess.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> drivers/platform/x86/eeepc-wmi.c +1
-1@@ -33,7 +33,7 @@#include <linux/input/sparse-keymap.h> #include <linux/dmi.h> #include <linux/fb.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include "asus-wmi.h" drivers/platform/x86/hp_accel.c +1
-1@@ -36,7 +36,7 @@#include <linux/uaccess.h> #include <linux/leds.h> #include <linux/atomic.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "../../misc/lis3lv02d/lis3lv02d.h" #define DRIVER_NAME "hp_accel"drivers/platform/x86/ideapad-laptop.c +1
-2@@ -26,8 +26,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/platform_device.h> #include <linux/input.h> drivers/platform/x86/intel-rst.c +1
-1@@ -20,7 +20,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );drivers/platform/x86/intel-smartconnect.c +1
-1@@ -19,7 +19,7 @@#include <linux/init.h> #include <linux/module.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );drivers/platform/x86/intel_menlow.c +1
-3@@ -36,10 +36,8 @@#include <linux/types.h> #include <linux/pci.h> #include <linux/pm.h> -#include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Thomas Sujith" );MODULE_AUTHOR ("Zhang Rui" );drivers/platform/x86/intel_oaktrail.c +0
-3@@ -50,9 +50,6 @@#include <linux/platform_device.h> #include <linux/dmi.h> #include <linux/rfkill.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#define DRIVER_NAME "intel_oaktrail"#define DRIVER_VERSION "0.4ac1"drivers/platform/x86/mxm-wmi.c +1
-2@@ -20,8 +20,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Dave Airlie" );MODULE_DESCRIPTION ("MXM WMI Driver" );drivers/platform/x86/panasonic-laptop.c +1
-3@@ -125,12 +125,10 @@#include <linux/seq_file.h> #include <linux/uaccess.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#ifndef ACPI_HOTKEY_COMPONENT #define ACPI_HOTKEY_COMPONENT 0x10000000#endif drivers/platform/x86/pvpanic.c +1
-2@@ -24,8 +24,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Hu Tao <[email protected]>" );MODULE_DESCRIPTION ("pvpanic device driver" );drivers/platform/x86/samsung-q10.c +1
-1@@ -15,7 +15,7 @@#include <linux/platform_device.h> #include <linux/backlight.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define SAMSUNGQ10_BL_MAX_INTENSITY 7drivers/platform/x86/sony-laptop.c +1
-3@@ -61,9 +61,6 @@#include <linux/workqueue.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <asm/uaccess.h> #include <linux/sonypi.h> #include <linux/sony-laptop.h> #include <linux/rfkill.h> @@ -71,6 +68,7 @@#include <linux/poll.h> #include <linux/miscdevice.h> #endif +#include <asm/uaccess.h> #define dprintk (fmt, ...) \ do { \drivers/platform/x86/tc1100-wmi.c +1
-3@@ -32,9 +32,7 @@#include <linux/slab.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #define GUID "C364AC71-36DB-495A-8494-B439D472A505"drivers/platform/x86/thinkpad_acpi.c +4
-10@@ -61,7 +61,6 @@#include <linux/freezer.h> #include <linux/delay.h> #include <linux/slab.h> -#include <linux/nvram.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> @@ -74,21 +73,16 @@#include <linux/input.h> #include <linux/leds.h> #include <linux/rfkill.h> -#include <asm/uaccess.h> -#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/workqueue.h> - +#include <linux/acpi.h> +#include <linux/pci_ids.h> +#include <linux/thinkpad_acpi.h> #include <sound/core.h> #include <sound/control.h> #include <sound/initval.h> - -#include <acpi/acpi_drivers.h> - -#include <linux/pci_ids.h> - -#include <linux/thinkpad_acpi.h> +#include <asm/uaccess.h> /* ThinkPad CMOS commands */ #define TP_CMOS_VOLUME_DOWN 0drivers/platform/x86/toshiba_acpi.c +1
-3@@ -54,11 +54,9 @@#include <linux/slab.h> #include <linux/workqueue.h> #include <linux/i8042.h> - +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> -MODULE_AUTHOR ("John Belmonte" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Extras Driver" );MODULE_LICENSE ("GPL" );drivers/platform/x86/toshiba_bluetooth.c +1
-3@@ -23,14 +23,12 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Jes Sorensen <[email protected]>" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Bluetooth Enable Driver" );MODULE_LICENSE ("GPL" ); -static int toshiba_bt_rfkill_add (struct acpi_device *device);static int toshiba_bt_rfkill_remove (struct acpi_device *device);static void toshiba_bt_rfkill_notify (struct acpi_device *device,u32 event);drivers/platform/x86/wmi.c +0
-2@@ -37,8 +37,6 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> ACPI_MODULE_NAME ("wmi" );MODULE_AUTHOR ("Carlos Corbacho" );drivers/platform/x86/xo15-ebook.c +1
-2@@ -18,8 +18,7 @@#include <linux/init.h> #include <linux/types.h> #include <linux/input.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define MODULE_NAME "xo15-ebook"drivers/pnp/pnpacpi/core.c +0
-1@@ -24,7 +24,6 @@#include <linux/pnp.h> #include <linux/slab.h> #include <linux/mod_devicetable.h> -#include <acpi/acpi_bus.h> #include "../base.h" #include "pnpacpi.h" drivers/pnp/pnpacpi/pnpacpi.h +0
-1@@ -1,7 +1,6 @@#ifndef ACPI_PNP_H #define ACPI_PNP_H -#include <acpi/acpi_bus.h> #include <linux/acpi.h> #include <linux/pnp.h> drivers/sfi/sfi_acpi.c +1
-2@@ -60,8 +60,7 @@#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt#include <linux/kernel.h> -#include <acpi/acpi.h> - +#include <linux/acpi.h> #include <linux/sfi.h> #include "sfi_core.h" drivers/staging/quickstart/quickstart.c +1
-1@@ -31,7 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #include <linux/input.h> drivers/usb/core/usb-acpi.c +0
-1@@ -16,7 +16,6 @@#include <linux/acpi.h> #include <linux/pci.h> #include <linux/usb/hcd.h> -#include <acpi/acpi_bus.h> #include "usb.h" drivers/xen/xen-acpi-cpuhotplug.c +0
-3@@ -24,10 +24,7 @@#include <linux/cpu.h> #include <linux/acpi.h> #include <linux/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/processor.h> -#include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> drivers/xen/xen-acpi-memhotplug.c +0
-1@@ -22,7 +22,6 @@#include <linux/init.h> #include <linux/types.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> drivers/xen/xen-acpi-pad.c +2
-3@@ -18,11 +18,10 @@#include <linux/kernel.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <asm/xen/hypercall.h> +#include <linux/acpi.h> #include <xen/interface/version.h> #include <xen/xen-ops.h> +#include <asm/xen/hypercall.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"drivers/xen/xen-acpi-processor.c +1
-3@@ -28,10 +28,8 @@#include <linux/module.h> #include <linux/types.h> #include <linux/syscore_ops.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <xen/xen.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> include/acpi/acpi_bus.h +0
-2@@ -28,8 +28,6 @@#include <linux/device.h> -#include <acpi/acpi.h> -/* TBD: Make dynamic */ #define ACPI_MAX_HANDLES 10struct acpi_handle_list {include/acpi/acpi_drivers.h +0
-3@@ -26,9 +26,6 @@#ifndef __ACPI_DRIVERS_H__#define __ACPI_DRIVERS_H__ -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#define ACPI_MAX_STRING 80/* include/linux/acpi_io.h +1
-1@@ -2,7 +2,7 @@#define _ACPI_IO_H_#include <linux/io.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys,acpi_size size)include/linux/ide.h +2
-6@@ -18,14 +18,10 @@#include <linux/completion.h> #include <linux/pm.h> #include <linux/mutex.h> -#ifdef CONFIG_BLK_DEV_IDEACPI -#include <acpi/acpi.h> -#endif -#include <asm/byteorder.h> -#include <asm/io.h> -/* for request_sense */ #include <linux/cdrom.h> +#include <asm/byteorder.h> +#include <asm/io.h> #if defined(CONFIG_CRIS ) || defined(CONFIG_FRV ) || defined(CONFIG_MN10300 )# define SUPPORT_VLB_SYNC 0include/linux/iscsi_ibft.h +1
-1@@ -21,7 +21,7 @@#ifndef ISCSI_IBFT_H #define ISCSI_IBFT_H -#include <acpi/acpi.h> +#include <linux/acpi.h> /* * Logical location of iSCSI Boot Format Table. include/linux/pci_hotplug.h +1
-2@@ -175,8 +175,7 @@ struct hotplug_params { };#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> int pci_get_hp_params (struct pci_dev *dev,struct hotplug_params *hpp);int acpi_get_hp_hw_control_from_firmware (struct pci_dev *dev,u32 flags);int acpi_pci_check_ejectable (struct pci_bus *pbus,acpi_handle handle);include/linux/sfi_acpi.h +1
-1@@ -60,7 +60,7 @@#define _LINUX_SFI_ACPI_H#ifdef CONFIG_SFI -#include <acpi/acpi.h> /* struct acpi_table_header */ +#include <linux/acpi.h> extern int sfi_acpi_table_parse(char *signature, char *oem_id, char *oem_table_id,include/linux/tboot.h +1
-1@@ -34,7 +34,7 @@ enum { };#ifdef CONFIG_INTEL_TXT -#include <acpi/acpi.h> +#include <linux/acpi.h> /* used to communicate between tboot and the launched kernel */ #define TB_KEY_SIZE 64/* 512 bits */ tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +1
-5@@ -25,12 +25,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/delay.h> - +#include <linux/acpi.h> #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -static int pm_tmr_ioport =0 ;/*helper function to safely read acpi pm timesource*/ --1.7.10
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
cover ACPI: Cleanup direct ACPICA inclusions.
In reply to Lv Zheng(Updated due to commit details attached.)
The patch in the linux-pm/linux-next queue is used as an experiment to catch wrong ACPICA dependencies and inclusions:
Commit: 4e8fb7987f7d0390a2e74622c7c1cbb6760c6516
From: Lv Zheng <[email protected]>
Date: Tue, 3 Dec 2013 08:49:16 +0800
Subject: [PATCH] ACPI: Clean up inclusions of ACPI header files Replace direct inclusions of <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions and remove some inclusions of those files that aren't necessary.
Now we got build errors triggered for them. Such errors include:
1. "ACPI IGD OpRegion" support in i915 DRM driver. It can be modified to be CONFIG_ACPI dependent.
2. "_CRS based MCFG checker" support, original configurability of this piece of code relies on link stage optimization. This patchset corrects it by making the configurability to be dependent on compile stage references.
3. "iSCSI IBFT finder" support. IBFT can only appear on ACPI platforms while IBFT locating mechanism doesn't rely on ACPI table constructions. It is currently not dependent on CONFIG_ACPI. IMO, this behavior is This patchset corrects it by making it dependent on CONFIG_ACPI. This patch need to be discussed, thus marked as RFC.
4. "SFI/ACPI wrapper" support. This error is not fixed in this patchset. Its solution is still under discussion. It need to be synchronized with SFI users.
Lv Zheng (3):
ACPI/i915: Fix wrong <acpi/acpi.h> inclusion in i915 opregion module. ACPI/SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper -
acpi_disabled linkage.
ACPI/IBFT: Fix wrong <acpi/acpi.h> inclusion in iSCSI boot firmware
module.
arch/x86/pci/mmconfig-shared.c | 7 +++++++ drivers/acpi/apei/apei-base.c | 1 - drivers/acpi/apei/apei-internal.h | 1 - drivers/acpi/apei/ghes.c | 1 - drivers/acpi/nvs.c | 1 - drivers/acpi/osl.c | 1 - drivers/firmware/Kconfig | 2 +- drivers/gpu/drm/gma500/opregion.c | 1 - drivers/gpu/drm/i915/Makefile | 3 +-- drivers/gpu/drm/i915/i915_drv.h | 3 ++- include/acpi/acpi_io.h | 17 +++++++++++++++++ include/linux/acpi.h | 1 + include/linux/acpi_io.h | 18 ------------------ include/linux/iscsi_ibft.h | 2 +- 14 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 include/acpi/acpi_io.h delete mode 100644 include/linux/acpi_io.h
Signature · 1 line
1.7.10
PATCH 1/3 ACPI/i915: Fix wrong <acpi/acpi.h> inclusion in i915 opregion module.
In Linux kernel, ACPICA is wrapped and safely exported by CONFIG_ACPI. So all external modules should depend on CONFIG_ACPI rather than using ACPICA header directly for stubbing. But if we moves <acpi/acpi.h> inclusions into "#ifdef CONFIG_ACPI", build breakge can help to detect wrong ACPICA dependent modules.
One of the build breakage is:include/linux/acpi_io.h:7:45: error: unknown type name 'acpi_physical_address'include/linux/acpi_io.h:8:10: error: unknown type name 'acpi_size'include/linux/acpi_io.h:13:33: error: unknown type name 'acpi_physical_address'include/linux/acpi_io.h:15:40: warning: 'struct acpi_generic_address' declared inside parameter list [enabled by default] include/linux/acpi_io.h:15:40: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] include/linux/acpi_io.h:16:43: warning: 'struct acpi_generic_address' declared inside parameter list [enabled by default] drivers/gpu/drm/i915/intel_opregion.c: In function 'intel_opregion_setup':drivers/gpu/drm/i915/intel_opregion.c:883:2: error: implicit declaration of function 'acpi_os_ioremap' [-Werror=implicit-function-declaration] drivers/gpu/drm/i915/intel_opregion.c:883:7: warning: assignment makes pointer from integer without a cast [enabled by default]
The root causes of this breakage are:
1. The <linux/acpi_io.h> depends on CONFIG_ACPI=y as most of the prototypes exported by it are implemented in drivers/acpi/osl.c.
2. CONFIG_DRM_I915 uses the only "inline" function acpi_os_ioremap() to implement stubs but it shouldn't.
Since ACPI IGD OpRegion is an ACPI-based mechanism, (please refer to the Doclink below), this patch fixes this issue by making drivers/gpu/drm/i915/intel_opregion.c dependent on CONFIG_ACPI. This is identical to other Intel DRM drivers' OpRegion support (e.x., drivers/gpu/drm/gma500/opregion.c).
Since acpi_io.h is not safe for CONFIG_ACPI=y environment, this patch also moves it to include/acpi, includes it in <linux/acpi.h> for CONFIG_ACPI=y build environment and cleans up its inclusions by converting them into <linux/acpi.h> inclusions.
Doclink: https://01.org/linuxgraphics/sites/default/files/documentation/acpi_igd_opregion_spec.pdf
--- drivers/acpi/apei/apei-base.c | 1 - drivers/acpi/apei/apei-internal.h | 1 - drivers/acpi/apei/ghes.c | 1 - drivers/acpi/nvs.c | 1 - drivers/acpi/osl.c | 1 - drivers/gpu/drm/gma500/opregion.c | 1 - drivers/gpu/drm/i915/Makefile | 3 +-- drivers/gpu/drm/i915/i915_drv.h | 3 ++- include/acpi/acpi_io.h | 17 +++++++++++++++++ include/linux/acpi.h | 1 + include/linux/acpi_io.h | 18 ------------------ 11 files changed, 21 insertions(+), 27 deletions(-) create mode 100644 include/acpi/acpi_io.h delete mode 100644 include/linux/acpi_io.h
drivers/acpi/apei/apei-base.c +0 -1
@@ -34,7 +34,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> #include <linux/slab.h> #include <linux/io.h> #include <linux/kref.h>
drivers/acpi/apei/apei-internal.h +0 -1
@@ -8,7 +8,6 @@#include <linux/cper.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> struct apei_exec_context ;
drivers/acpi/apei/ghes.c +0 -1
@@ -33,7 +33,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> #include <linux/io.h> #include <linux/interrupt.h> #include <linux/timer.h>
drivers/acpi/nvs.c +0 -1
@@ -12,7 +12,6 @@#include <linux/mm.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> /* ACPI NVS regions, APEI may use it */
drivers/acpi/osl.c +0 -1
@@ -39,7 +39,6 @@#include <linux/workqueue.h> #include <linux/nmi.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> #include <linux/efi.h> #include <linux/ioport.h> #include <linux/list.h>
drivers/gpu/drm/gma500/opregion.c +0 -1
@@ -22,7 +22,6 @@* */ #include <linux/acpi.h> -#include <linux/acpi_io.h> #include "psb_drv.h" #include "psb_intel_reg.h"
drivers/gpu/drm/i915/Makefile +1 -2
@@ -38,7 +38,6 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \ intel_ringbuffer.o \ intel_overlay.o \ intel_sprite.o \ - intel_opregion.o \ intel_sideband.o \ intel_uncore.o \ dvo_ch7xxx.o \
@@ -51,7 +50,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \ i915-$(CONFIG_COMPAT) += i915_ioc32.o -i915-$(CONFIG_ACPI) += intel_acpi.o +i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -2336,8 +2336,8 @@ extern void intel_i2c_reset(struct drm_device *dev);/* intel_opregion.c */ struct intel_encoder ; -extern int intel_opregion_setup (struct drm_device *dev);#ifdef CONFIG_ACPI +extern int intel_opregion_setup (struct drm_device *dev);extern void intel_opregion_init (struct drm_device *dev);extern void intel_opregion_fini (struct drm_device *dev);extern void intel_opregion_asle_intr (struct drm_device *dev);
@@ -2346,6 +2346,7 @@ extern int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,extern int intel_opregion_notify_adapter (struct drm_device *dev,pci_power_t state);#else +static inline int intel_opregion_setup (struct drm_device *dev) {return 0 ; }static inline void intel_opregion_init (struct drm_device *dev) {return ; }static inline void intel_opregion_fini (struct drm_device *dev) {return ; }static inline void intel_opregion_asle_intr (struct drm_device *dev) {return ; }
include/acpi/acpi_io.h new file +17 -0
@@ -0,0 +1,17 @@ +#ifndef _ACPI_IO_H_ +#define _ACPI_IO_H_ + +#include <linux/io.h> + +static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys, +acpi_size size) +{ +return ioremap_cache (phys, size); +} + +void __iomem *acpi_os_get_iomem (acpi_physical_address phys,unsigned int size); + +int acpi_os_map_generic_address (struct acpi_generic_address *addr); +void acpi_os_unmap_generic_address (struct acpi_generic_address *addr); + +#endif
include/linux/acpi.h +1 -0
@@ -42,6 +42,7 @@#include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_numa.h> +#include <acpi/acpi_io.h> #include <asm/acpi.h> static inline acpi_handle acpi_device_handle (struct acpi_device *adev)
include/linux/acpi_io.h deleted +0 -18
@@ -1,18 +0,0 @@ -#ifndef _ACPI_IO_H_ -#define _ACPI_IO_H_ - -#include <linux/io.h> -#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ - -static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys, -acpi_size size) -{ -return ioremap_cache (phys, size); -} - -void __iomem *acpi_os_get_iomem (acpi_physical_address phys,unsigned int size); - -int acpi_os_map_generic_address (struct acpi_generic_address *addr); -void acpi_os_unmap_generic_address (struct acpi_generic_address *addr); - -#endif
Signature · 1 line
1.7.10
Re: [Intel-gfx] [PATCH 1/3] ACPI/i915: Fix wrong <acpi/acpi.h> inclusion in i915 opregion module.
Quoted 34 lines · Lv Zheng
In Linux kernel, ACPICA is wrapped and safely exported by
CONFIG_ACPI. So all external modules should depend onCONFIG_ACPIrather than using ACPICA header directly for stubbing. But if we moves <acpi/acpi.h> inclusions into "#ifdefCONFIG_ACPI", build breakge can help to detect wrong ACPICA dependent modules.One of the build breakage is:
include/linux/acpi_io.h:7:45: error: unknown type name 'acpi_physical_address'include/linux/acpi_io.h:8:10: error: unknown type name 'acpi_size'include/linux/acpi_io.h:13:33: error: unknown type name 'acpi_physical_address'include/linux/acpi_io.h:15:40: warning: 'structacpi_generic_address' declared inside parameter list [enabled by default]include/linux/acpi_io.h:15:40: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]include/linux/acpi_io.h:16:43: warning: 'structacpi_generic_address' declared inside parameter list [enabled by default]drivers/gpu/drm/i915/intel_opregion.c: In function 'intel_opregion_setup':drivers/gpu/drm/i915/intel_opregion.c:883:2: error: implicit declaration of function 'acpi_os_ioremap' [-Werror=implicit-function-declaration]drivers/gpu/drm/i915/intel_opregion.c:883:7: warning: assignment makes pointer from integer without a cast [enabled by default]The root causes of this breakage are:
1. The <linux/acpi_io.h> depends onCONFIG_ACPI=yas most of the prototypes exported by it are implemented indrivers/acpi/osl.c.
2.CONFIG_DRM_I915uses the only "inline" functionacpi_os_ioremap()to implement stubs but it shouldn't.Since ACPI IGD OpRegion is an ACPI-based mechanism, (please refer to the Doclink below), this patch fixes this issue by making
drivers/gpu/drm/i915/intel_opregion.cdependent onCONFIG_ACPI. This is identical to other Intel DRM drivers' OpRegion support (e.x.,drivers/gpu/drm/gma500/opregion.c).Since
acpi_io.his not safe forCONFIG_ACPI=yenvironment, this patch also moves it toinclude/acpi, includes it in <linux/acpi.h> forCONFIG_ACPI=ybuild environment and cleans up its inclusions by converting them into <linux/acpi.h> inclusions.
Quoted 5 lines
Doclink: https://01.org/linuxgraphics/sites/default/files/documentation/acpi_igd_opregion_spec.pdf
Cc Matthew Garrett <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Lv Zheng <[email protected]>
Makes sense. Acked for merging through acpi trees (or whatever else is appropriate, patch seems to be part of a series).
Cheers, Daniel
Quoted 197 lines
--- drivers/acpi/apei/apei-base.c | 1 - drivers/acpi/apei/apei-internal.h | 1 - drivers/acpi/apei/ghes.c | 1 - drivers/acpi/nvs.c | 1 - drivers/acpi/osl.c | 1 - drivers/gpu/drm/gma500/opregion.c | 1 - drivers/gpu/drm/i915/Makefile | 3 +-- drivers/gpu/drm/i915/i915_drv.h | 3 ++- include/acpi/acpi_io.h | 17 +++++++++++++++++ include/linux/acpi.h | 1 + include/linux/acpi_io.h | 18 ------------------ 11 files changed, 21 insertions(+), 27 deletions(-) create mode 100644 include/acpi/acpi_io.h delete mode 100644 include/linux/acpi_io.hdrivers/acpi/apei/apei-base.c +0
-1@@ -34,7 +34,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> #include <linux/slab.h> #include <linux/io.h> #include <linux/kref.h> drivers/acpi/apei/apei-internal.h +0
-1@@ -8,7 +8,6 @@#include <linux/cper.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> struct apei_exec_context ;drivers/acpi/apei/ghes.c +0
-1@@ -33,7 +33,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> #include <linux/io.h> #include <linux/interrupt.h> #include <linux/timer.h> drivers/acpi/nvs.c +0
-1@@ -12,7 +12,6 @@#include <linux/mm.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> /* ACPI NVS regions, APEI may use it */ drivers/acpi/osl.c +0
-1@@ -39,7 +39,6 @@#include <linux/workqueue.h> #include <linux/nmi.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> #include <linux/efi.h> #include <linux/ioport.h> #include <linux/list.h> drivers/gpu/drm/gma500/opregion.c +0
-1@@ -22,7 +22,6 @@* */ #include <linux/acpi.h> -#include <linux/acpi_io.h> #include "psb_drv.h" #include "psb_intel_reg.h" drivers/gpu/drm/i915/Makefile +1
-2@@ -38,7 +38,6 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \ intel_ringbuffer.o \ intel_overlay.o \ intel_sprite.o \ - intel_opregion.o \ intel_sideband.o \ intel_uncore.o \ dvo_ch7xxx.o \@@ -51,7 +50,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \ i915-$(CONFIG_COMPAT) += i915_ioc32.o -i915-$(CONFIG_ACPI) += intel_acpi.o +i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.odrivers/gpu/drm/i915/i915_drv.h +2
-1@@ -2336,8 +2336,8 @@ extern void intel_i2c_reset(struct drm_device *dev);/* intel_opregion.c */ struct intel_encoder ; -extern int intel_opregion_setup (struct drm_device *dev);#ifdef CONFIG_ACPI +extern int intel_opregion_setup (struct drm_device *dev);extern void intel_opregion_init (struct drm_device *dev);extern void intel_opregion_fini (struct drm_device *dev);extern void intel_opregion_asle_intr (struct drm_device *dev);@@ -2346,6 +2346,7 @@ extern int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,extern int intel_opregion_notify_adapter (struct drm_device *dev,pci_power_t state);#else +static inline int intel_opregion_setup (struct drm_device *dev) {return 0 ; }static inline void intel_opregion_init (struct drm_device *dev) {return ; }static inline void intel_opregion_fini (struct drm_device *dev) {return ; }static inline void intel_opregion_asle_intr (struct drm_device *dev) {return ; }include/acpi/acpi_io.h new file +17
-0@@ -0,0 +1,17 @@ +#ifndef _ACPI_IO_H_ +#define _ACPI_IO_H_ + +#include <linux/io.h> + +static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys, +acpi_size size) +{ +return ioremap_cache (phys, size); +} + +void __iomem *acpi_os_get_iomem (acpi_physical_address phys,unsigned int size); + +int acpi_os_map_generic_address (struct acpi_generic_address *addr); +void acpi_os_unmap_generic_address (struct acpi_generic_address *addr); + +#endif include/linux/acpi.h +1
-0@@ -42,6 +42,7 @@#include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_numa.h> +#include <acpi/acpi_io.h> #include <asm/acpi.h> static inline acpi_handle acpi_device_handle (struct acpi_device *adev)include/linux/acpi_io.h deleted +0
-18@@ -1,18 +0,0 @@ -#ifndef _ACPI_IO_H_ -#define _ACPI_IO_H_ - -#include <linux/io.h> -#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ - -static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys, -acpi_size size) -{ -return ioremap_cache (phys, size); -} - -void __iomem *acpi_os_get_iomem (acpi_physical_address phys,unsigned int size); - -int acpi_os_map_generic_address (struct acpi_generic_address *addr); -void acpi_os_unmap_generic_address (struct acpi_generic_address *addr); - -#endif Signature · 6 lines
1.7.10 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [Intel-gfx] [PATCH 1/3] ACPI/i915: Fix wrong <acpi/acpi.h> inclusion in i915 opregion module.
In reply to Lv ZhengQuoted 36 lines · Lv Zheng
drivers/gpu/drm/i915/Makefile +1
-2@@ -38,7 +38,6 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \ intel_ringbuffer.o \ intel_overlay.o \ intel_sprite.o \ - intel_opregion.o \ intel_sideband.o \ intel_uncore.o \ dvo_ch7xxx.o \@@ -51,7 +50,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \ i915-$(CONFIG_COMPAT) += i915_ioc32.o -i915-$(CONFIG_ACPI) += intel_acpi.o +i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.odrivers/gpu/drm/i915/i915_drv.h +1
-1@@ -2336,8 +2336,8 @@ extern void intel_i2c_reset(struct drm_device *dev);/* intel_opregion.c */ struct intel_encoder ; -extern int intel_opregion_setup (struct drm_device *dev);#ifdef CONFIG_ACPI +extern int intel_opregion_setup (struct drm_device *dev);extern void intel_opregion_init (struct drm_device *dev);extern void intel_opregion_fini (struct drm_device *dev);extern void intel_opregion_asle_intr (struct drm_device *dev);
drivers/gpu/drm/i915/i915_drv.h extern int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder, · line 2352
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -2346,6 +2346,7 @@ extern int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,extern int intel_opregion_notify_adapter (struct drm_device *dev,pci_power_t state);#else +static inline int intel_opregion_setup (struct drm_device *dev) {return 0 ; }static inline void intel_opregion_init (struct drm_device *dev) {return ; }static inline void intel_opregion_fini (struct drm_device *dev) {return ; }static inline void intel_opregion_asle_intr (struct drm_device *dev) {return ; }
FWIW, the above i915 specific hunks are
Nuking the CONFIG_ACPI conditional build within intel_opregion.c is an obvious follow-up patch later on.
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
PATCH 2/3 ACPI/SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper - acpi_disabled linkage.
In reply to Lv ZhengIn Linux kernel, ACPICA is wrapped and safely exported by CONFIG_ACPI. So all external modules should depend on CONFIG_ACPI rather than using ACPICA header directly for stubbing. But if we moves <acpi/acpi.h> inclusions into "#ifdef CONFIG_ACPI", build breakge can help to detect wrong ACPICA dependent modules.
One of the build breakage is:arch/x86/pci/mmconfig-shared.c:389:1: error: unknown type name 'acpi_status'arch/x86/pci/mmconfig-shared.c:389:47: warning: 'struct acpi_resource' declared inside parameter list [enabled by default] arch/x86/pci/mmconfig-shared.c:389:47: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] arch/x86/pci/mmconfig-shared.c: In function 'check_mcfg_resource':arch/x86/pci/mmconfig-shared.c:392:33: error: storage size of 'address' isn't knownarch/x86/pci/mmconfig-shared.c:393:2: error: unknown type name 'acpi_status'arch/x86/pci/mmconfig-shared.c:395:9: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:395:19: error: 'ACPI_RESOURCE_TYPE_FIXED_MEMORY32' undeclared (first use in this function) arch/x86/pci/mmconfig-shared.c:395:19: note: each undeclared identifier is reported only once for each function it appears in arch/x86/pci/mmconfig-shared.c:397:8: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:399:11: error: 'AE_OK' undeclared (first use in this function) arch/x86/pci/mmconfig-shared.c:400:35: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:401:33: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:402:19: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:404:11: error: 'AE_CTRL_TERMINATE' undeclared (first use in this function) arch/x86/pci/mmconfig-shared.c:407:10: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:407:20: error: 'ACPI_RESOURCE_TYPE_ADDRESS32' undeclared (first use in this function) arch/x86/pci/mmconfig-shared.c:408:10: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:408:20: error: 'ACPI_RESOURCE_TYPE_ADDRESS64' undeclared (first use in this function) arch/x86/pci/mmconfig-shared.c:411:2: error: implicit declaration of function 'acpi_resource_to_address64' [-Werror=implicit-function-declaration] arch/x86/pci/mmconfig-shared.c:412:2: error: implicit declaration of function 'ACPI_FAILURE' [-Werror=implicit-function-declaration] arch/x86/pci/mmconfig-shared.c:414:31: error: 'ACPI_MEMORY_RANGE' undeclared (first use in this function) arch/x86/pci/mmconfig-shared.c:392:33: warning: unused variable 'address' [-Wunused-variable]arch/x86/pci/mmconfig-shared.c: At top level:arch/x86/pci/mmconfig-shared.c:425:1: error: unknown type name 'acpi_status'arch/x86/pci/mmconfig-shared.c:425:41: error: unknown type name 'acpi_handle'arch/x86/pci/mmconfig-shared.c: In function 'is_acpi_reserved':arch/x86/pci/mmconfig-shared.c:447:2: error: implicit declaration of function 'acpi_get_devices' [-Werror=implicit-function-declaration] arch/x86/pci/mmconfig-shared.c:447:30: error: 'find_mboard_resource' undeclared (first use in this function) arch/x86/pci/mmconfig-shared.c: At top level:arch/x86/pci/mmconfig-shared.c:389:20: warning: 'check_mcfg_resource' defined but not used [-Wunused-function]
The root cause of this breakage is:
1. The following commit doesn't protect ACPICA functions like acpi_get_devices()/acpi_walk_resources()/acpi_resource_to_address64() in CONFIG_SFI=y and CONFIG_ACPI=n environment:
Commit: 5f0db7a2fb78895a197f64e548333b3bbd433996
Author: Feng Tang <[email protected]>
Subject: SFI: Hook PCI MMCONFIG
First check ACPI, and if that fails, ask SFI to find the MCFG.
So it actually depends on the logic that in !CONFIG_ACPI builds, code blocks under "if (!acpi_disabled)" will not be linked in.
This patch fixes this issue by introducing a stub for MCFG entry checker is_acpi_reserved() in !CONFIG_ACPI builds.
--- arch/x86/pci/mmconfig-shared.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/x86/pci/mmconfig-shared.c +7 -0
@@ -370,6 +370,7 @@ static int __init pci_mmcfg_check_hostbridge(void)return !list_empty (&pci_mmcfg_list); } +#ifdef CONFIG_ACPI static acpi_status check_mcfg_resource (struct acpi_resource *res,void *data) {struct resource *mcfg_res = data;
@@ -436,6 +437,12 @@ static int is_acpi_reserved(u64 start, u64 end, unsigned not_used) return mcfg_res.flags; } +#else +static inline int is_acpi_reserved (u64 start,u64 end,unsigned not_used) +{ +return 0 ; +} +#endif typedef int (*check_reserved_t )(u64 start,u64 end,unsigned type);
Signature · 1 line
1.7.10
RFC PATCH 3/3 ACPI/IBFT: Fix wrong <acpi/acpi.h> inclusion in iSCSI boot firmware module.
In reply to Lv ZhengIn Linux kernel, ACPICA is wrapped and safely exported by CONFIG_ACPI. So all external modules should depend on CONFIG_ACPI rather than using ACPICA header directly for stubbing. But if we moves <acpi/acpi.h> inclusions into "#ifdef CONFIG_ACPI", build breakge can help to detect wrong ACPICA dependent modules.
One of the build breakage is:drivers/firmware/iscsi_ibft_find.c: In function 'find_ibft_region':drivers/firmware/iscsi_ibft_find.c:106:12: error: dereferencing pointer to incomplete type drivers/firmware/iscsi_ibft_find.c:106:12: error: dereferencing pointer to incomplete type drivers/firmware/iscsi_ibft_find.c:106:12: error: dereferencing pointer to incomplete type
The root cause of this breakage is:
1. iBFT locating is implemented by looking up it in the memory. This is based on the specification. Specification doesn't mention if it can appear on a non-ACPI platforms but mentions it is defined in ACPI 3.0b. The current CONFIG_ISCSI_IBFT_FIND doesn't use ACPI table APIs to locate the table, thus it doesn't rely on CONFIG_ACPI.
Since ACPI iSCSI Boot Firmware is an ACPI-based mechanism (please refer to the Doclink below), we can make CONFIG_ISCSI_IBFT_FIND dependent on CONFIG_ACPI though the locating mechanism can be implemented without using ACPI table APIs. But please let me know if this is wrong.
Doclink: http://www.microsoft.com/whdc/system/platform/firmware/ibft.mspx
--- drivers/firmware/Kconfig | 2 +- include/linux/iscsi_ibft.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/Kconfig +1 -1
@@ -110,7 +110,7 @@ config DMI_SYSFS config ISCSI_IBFT_FIND bool "iSCSI Boot Firmware Table Attributes" - depends on X86 + depends on X86 && ACPI default n help This option enables the kernel to find the region of memory
include/linux/iscsi_ibft.h +1 -1
@@ -21,7 +21,7 @@#ifndef ISCSI_IBFT_H #define ISCSI_IBFT_H -#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ +#include <linux/acpi.h> /* * Logical location of iSCSI Boot Format Table.
Signature · 1 line
1.7.10
PATCH v2 1/1 ACPI/i915: Fix wrong <acpi/acpi.h> inclusion in i915 opregion module.
In reply to Lv ZhengFrom: Lv Zheng <[email protected]>
In Linux kernel, ACPICA is wrapped and safely exported by CONFIG_ACPI. So all external modules should depend on CONFIG_ACPI rather than using ACPICA header directly for stubbing. But if we moves <acpi/acpi.h> inclusions into "#ifdef CONFIG_ACPI", build breakge can help to detect wrong ACPICA dependent modules.
One of the build breakage is:include/linux/acpi_io.h:7:45: error: unknown type name 'acpi_physical_address'include/linux/acpi_io.h:8:10: error: unknown type name 'acpi_size'include/linux/acpi_io.h:13:33: error: unknown type name 'acpi_physical_address'include/linux/acpi_io.h:15:40: warning: 'struct acpi_generic_address' declared inside parameter list [enabled by default] include/linux/acpi_io.h:15:40: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] include/linux/acpi_io.h:16:43: warning: 'struct acpi_generic_address' declared inside parameter list [enabled by default] drivers/gpu/drm/i915/intel_opregion.c: In function 'intel_opregion_setup':drivers/gpu/drm/i915/intel_opregion.c:883:2: error: implicit declaration of function 'acpi_os_ioremap' [-Werror=implicit-function-declaration] drivers/gpu/drm/i915/intel_opregion.c:883:7: warning: assignment makes pointer from integer without a cast [enabled by default]
The root causes of this breakage are:
1. The <linux/acpi_io.h> depends on CONFIG_ACPI=y as most of the prototypes exported by it are implemented in drivers/acpi/osl.c.
2. CONFIG_DRM_I915 uses the only "inline" function acpi_os_ioremap() to implement stubs but it shouldn't.
Since ACPI IGD OpRegion is an ACPI-based mechanism, (please refer to the Doclink below), this patch fixes this issue by making drivers/gpu/drm/i915/intel_opregion.c dependent on CONFIG_ACPI. This is identical to other Intel DRM drivers' OpRegion support (e.x., drivers/gpu/drm/gma500/opregion.c).
Since acpi_io.h is not safe for CONFIG_ACPI=y environment, this patch also moves it to include/acpi, includes it in <linux/acpi.h> for CONFIG_ACPI=y build environment and cleans up its inclusions by converting them into <linux/acpi.h> inclusions.
After that, since all <acpi/acpi_io.h> inclusions are CONFIG_ACPI dependent, the FIXME marked <acpi/acpi.h> inclusion in <acpi/acpi_io.h> is also deleted in this patch.
Doclink: https://01.org/linuxgraphics/sites/default/files/documentation/acpi_igd_opregion_spec.pdf
---
Updated due to:
1. Patch descripition is changed, "FIXME deletion" notes is added;
2. A mistake is fixed in the original patch. The change in the drivers/gpu/drm/i915/intel_opregion.c is not added to the quilt. It's lost as a process issues in my tests.
This update fixes this issue by deleting linux/acpi_io.h inclusion from drivers/gpu/drm/i915/intel_opregion.c.
Recursive build test environment is set up as follows:
Following CONFIGs are enabled by default:
CONFIG_DRM_I915=y
CONFIG_DRM_GMA500=y
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=y
CONFIG_ACPI_APEI_EINJ=y
CONFIG_ACPI_APEI_ERST_DEBUG=y
Following special CONFIG tests are enabled:
CONFIG_ACPI=n
Following special object tests are enabled:
drivers/acpi/apei/erst.o
drivers/acpi/apei/hest.o
drivers/acpi/apei/ghes.o
drivers/acpi/apei/einj.o
drivers/acpi/apei/erst-dbg.o drivers/gpu/drm/i915/intel_opregion.o drivers/gpu/drm/gma500/opregion.o
It is done after merging the patch and before signing-off the patch.
--- drivers/acpi/apei/apei-base.c | 1 - drivers/acpi/apei/apei-internal.h | 1 - drivers/acpi/apei/ghes.c | 1 - drivers/acpi/nvs.c | 1 - drivers/acpi/osl.c | 1 - drivers/gpu/drm/gma500/opregion.c | 1 - drivers/gpu/drm/i915/Makefile | 3 +-- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/intel_opregion.c | 1 - include/acpi/acpi_io.h | 17 +++++++++++++++++ include/linux/acpi.h | 1 + include/linux/acpi_io.h | 18 ------------------ 12 files changed, 21 insertions(+), 28 deletions(-) create mode 100644 include/acpi/acpi_io.h delete mode 100644 include/linux/acpi_io.h
drivers/acpi/apei/apei-base.c +0 -1
@@ -34,7 +34,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> #include <linux/slab.h> #include <linux/io.h> #include <linux/kref.h>
drivers/acpi/apei/apei-internal.h +0 -1
@@ -8,7 +8,6 @@#include <linux/cper.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> struct apei_exec_context ;
drivers/acpi/apei/ghes.c +0 -1
@@ -33,7 +33,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> #include <linux/io.h> #include <linux/interrupt.h> #include <linux/timer.h>
drivers/acpi/nvs.c +0 -1
@@ -12,7 +12,6 @@#include <linux/mm.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> /* ACPI NVS regions, APEI may use it */
drivers/acpi/osl.c +0 -1
@@ -39,7 +39,6 @@#include <linux/workqueue.h> #include <linux/nmi.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> #include <linux/efi.h> #include <linux/ioport.h> #include <linux/list.h>
drivers/gpu/drm/gma500/opregion.c +0 -1
@@ -22,7 +22,6 @@* */ #include <linux/acpi.h> -#include <linux/acpi_io.h> #include "psb_drv.h" #include "psb_intel_reg.h"
drivers/gpu/drm/i915/Makefile +1 -2
@@ -38,7 +38,6 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \ intel_ringbuffer.o \ intel_overlay.o \ intel_sprite.o \ - intel_opregion.o \ intel_sideband.o \ intel_uncore.o \ dvo_ch7xxx.o \
@@ -51,7 +50,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \ i915-$(CONFIG_COMPAT) += i915_ioc32.o -i915-$(CONFIG_ACPI) += intel_acpi.o +i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -2336,8 +2336,8 @@ extern void intel_i2c_reset(struct drm_device *dev);/* intel_opregion.c */ struct intel_encoder ; -extern int intel_opregion_setup (struct drm_device *dev);#ifdef CONFIG_ACPI +extern int intel_opregion_setup (struct drm_device *dev);extern void intel_opregion_init (struct drm_device *dev);extern void intel_opregion_fini (struct drm_device *dev);extern void intel_opregion_asle_intr (struct drm_device *dev);
@@ -2346,6 +2346,7 @@ extern int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,extern int intel_opregion_notify_adapter (struct drm_device *dev,pci_power_t state);#else +static inline int intel_opregion_setup (struct drm_device *dev) {return 0 ; }static inline void intel_opregion_init (struct drm_device *dev) {return ; }static inline void intel_opregion_fini (struct drm_device *dev) {return ; }static inline void intel_opregion_asle_intr (struct drm_device *dev) {return ; }
drivers/gpu/drm/i915/intel_opregion.c +0 -1
@@ -28,7 +28,6 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt#include <linux/acpi.h> -#include <linux/acpi_io.h> #include <acpi/video.h> #include <drm/drmP.h>
include/acpi/acpi_io.h new file +17 -0
@@ -0,0 +1,17 @@ +#ifndef _ACPI_IO_H_ +#define _ACPI_IO_H_ + +#include <linux/io.h> + +static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys, +acpi_size size) +{ +return ioremap_cache (phys, size); +} + +void __iomem *acpi_os_get_iomem (acpi_physical_address phys,unsigned int size); + +int acpi_os_map_generic_address (struct acpi_generic_address *addr); +void acpi_os_unmap_generic_address (struct acpi_generic_address *addr); + +#endif
include/linux/acpi.h +1 -0
@@ -42,6 +42,7 @@#include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_numa.h> +#include <acpi/acpi_io.h> #include <asm/acpi.h> static inline acpi_handle acpi_device_handle (struct acpi_device *adev)
include/linux/acpi_io.h deleted +0 -18
@@ -1,18 +0,0 @@ -#ifndef _ACPI_IO_H_ -#define _ACPI_IO_H_ - -#include <linux/io.h> -#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ - -static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys, -acpi_size size) -{ -return ioremap_cache (phys, size); -} - -void __iomem *acpi_os_get_iomem (acpi_physical_address phys,unsigned int size); - -int acpi_os_map_generic_address (struct acpi_generic_address *addr); -void acpi_os_unmap_generic_address (struct acpi_generic_address *addr); - -#endif
Signature · 1 line
1.7.10
v3 cover ACPI: Cleanup header inclusions.
In reply to Lv ZhengThis patchset includes 2 patches already merged in linux-pm/linux-next branch. It is included as the following mailing list thread contains two patchsets of the ACPICA header cleanups.
1. Cleanup header inclusions.
http://www.spinics.net/lists/linux-acpi/msg47510.html
2. Cleanup direct ACPICA inclusions.
http://www.spinics.net/lists/linux-acpi/msg47703.html
It is vague for the thread monitors.
This patchset collects all patches in this thread together to form a single v3 patchset.
ACPICA header files are lacking in stub protections. This makes all ACPICA header files could only be included for CONFIG_ACPI=y environment. This infects new ACPI prototypes, if such prototypes referenced ACPICA defined types, they must be incldued only in the CONFIG_ACPI=y environment. The <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> are the monstrosity infants born under this background, directly including them in the CONFIG_ACPI=n environment is not safe. The infection spreads to whole kernel source tree that we can see "#ifdef CONFIG_ACPI" here and there.
This patchset tries to enforces <linux/acpi.h> inclusions instead of <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusions.
For <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> inclusion cleanups, as all users are CONFIG_ACPI dependent, we don't have any issues raised.
For <acpi/acpi.h> inclusion cleanups, we have following 4 cases specially handled:
1. "ACPI IGD OpRegion" support in i915 DRM driver. It can be modified to be CONFIG_ACPI dependent.
2. "_CRS based MCFG checker" support, original configurability of this piece of code relies on link stage optimization. This patchset corrects it by making the configurability to be dependent on compile stage references.
3. "iSCSI IBFT finder" support. IBFT can only appear on ACPI platforms while IBFT locating mechanism doesn't rely on ACPI table constructions. It is currently not dependent on CONFIG_ACPI. IMO, this behavior is This patchset corrects it by making it dependent on CONFIG_ACPI. This patch need to be discussed, thus marked as RFC.
4. "SFI/ACPI wrapper" support. This error is not fixed in this patchset. Its solution is still under discussion. It need to be synchronized with SFI users.
During the fixes, <linux/acpi_io.h> is also detected as an ACPICA dependent header, it thus be converted into <acpi/acpi_io.h> and included from <linux/acpi.h> for CONFIG_ACPI builds.
NOTE that the first 2 commits in this series are already in the linux-pm/linux-next branch.
1. Commit: 91be0998578a1001db1382012676ee0a69d5cee3
Subject: [PATCH] ACPI: Clean up incorrect inclusions of ACPICA headers
2. Commit: 4e8fb7987f7d0390a2e74622c7c1cbb6760c6516
Subject: [PATCH] ACPI: Clean up inclusions of ACPI header files
The reset 4 commits are rebased on top of this branch thus can be applied to the branch directly.
Lv Zheng (6):
ACPI: Clean up incorrect inclusions of ACPICA headers
ACPI: Clean up inclusions of ACPI header files
SFI: Fix warnings reported by W=1 builds.
ACPI/i915: Fix wrong <acpi/acpi.h> inclusion in i915 opregion module. ACPI/SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper -
acpi_disabled linkage.
ACPI/IBFT: Fix wrong <acpi/acpi.h> inclusion in iSCSI boot firmware
module.
NOTE that this cover-letter is manually editted, so file summary is useless and thus gets deleted.
Signature · 1 line
1.7.10
PATCH v3 1/6 ACPI: Clean up incorrect inclusions of ACPICA headers
Header file <acpi/acpi.h> contains environemnt settings and architecture specific implementation that should be included before any other ACPICA headers in order to keep a consistent build environment for ACPICA users. The following internal ACPICA header files should be included from <acpi/acpi.h> and should not be included by other kernel files:
<acpi/acpiosxf.h>
<acpi/acpixf.h>
Clean up incorrect inclusions of these files from non-ACPICA source files.
--- drivers/acpi/nvs.c | 1 - drivers/hwmon/asus_atk0110.c | 1 - 2 files changed, 2 deletions(-)
drivers/acpi/nvs.c +0 -1
@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/acpi.h> #include <linux/acpi_io.h> -#include <acpi/acpiosxf.h> /* ACPI NVS regions, APEI may use it */
drivers/hwmon/asus_atk0110.c +0 -1
@@ -18,7 +18,6 @@#include <linux/err.h> #include <acpi/acpi.h> -#include <acpi/acpixf.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_bus.h>
Signature · 1 line
1.7.10
PATCH v3 2/6 ACPI: Clean up inclusions of ACPI header files
In reply to Lv ZhengReplace direct inclusions of <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions and remove some inclusions of those files that aren't necessary.
First of all, <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> should not be included directly from any files that are built for CONFIG_ACPI unset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. For CONFIG_ACPI set, <linux/acpi.h> includes those files and for CONFIG_ACPI unset it provides stub ACPI symbols to be used in that case.
Second, there are ordering dependencies between those files that always have to be met. Namely, it is required that <acpi/acpi_bus.h> be included prior to <acpi/acpi_drivers.h> so that the acpi_pci_root declarations the latter depends on are always there. And <acpi/acpi.h> which provides basic ACPICA type declarations should always be included prior to any other ACPI headers in CONFIG_ACPI builds. That also is taken care of including <linux/acpi.h> as appropriate.
--- arch/ia64/hp/common/aml_nfw.c | 3 +-- arch/x86/kernel/apic/apic_flat_64.c | 4 +--- arch/x86/kernel/apic/io_apic.c | 3 --- arch/x86/pci/mmconfig_32.c | 1 - arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-- drivers/acpi/ac.c | 3 +-- drivers/acpi/acpi_extlog.c | 1 - drivers/acpi/acpi_pad.c | 3 +-- drivers/acpi/apei/einj.c | 1 - drivers/acpi/battery.c | 3 +-- drivers/acpi/blacklist.c | 1 - drivers/acpi/bus.c | 2 -- drivers/acpi/button.c | 3 +-- drivers/acpi/custom_method.c | 2 +- drivers/acpi/debugfs.c | 2 +- drivers/acpi/dock.c | 2 -- drivers/acpi/ec.c | 5 ++--- drivers/acpi/event.c | 2 +- drivers/acpi/fan.c | 3 +-- drivers/acpi/hed.c | 2 -- drivers/acpi/numa.c | 1 - drivers/acpi/osl.c | 3 --- drivers/acpi/pci_irq.c | 2 -- drivers/acpi/pci_link.c | 4 +--- drivers/acpi/pci_root.c | 4 +--- drivers/acpi/power.c | 3 +-- drivers/acpi/proc.c | 4 +--- drivers/acpi/processor_core.c | 3 +-- drivers/acpi/processor_idle.c | 4 +--- drivers/acpi/processor_perflib.c | 7 ++----- drivers/acpi/processor_thermal.c | 7 ++----- drivers/acpi/processor_throttling.c | 7 ++----- drivers/acpi/sbshc.c | 3 +-- drivers/acpi/scan.c | 2 -- drivers/acpi/sleep.c | 4 ---- drivers/acpi/sysfs.c | 2 +- drivers/acpi/thermal.c | 5 ++--- drivers/acpi/utils.c | 2 -- drivers/acpi/video.c | 5 ++--- drivers/acpi/wakeup.c | 1 - drivers/ata/libata-acpi.c | 2 -- drivers/ata/pata_acpi.c | 5 ++--- drivers/char/hpet.c | 7 ++----- drivers/char/tpm/tpm_acpi.c | 2 +- drivers/char/tpm/tpm_ppi.c | 1 - drivers/gpu/drm/i915/intel_acpi.c | 2 -- drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +------ drivers/gpu/drm/radeon/radeon_acpi.c | 6 +----- drivers/hv/vmbus_drv.c | 2 -- drivers/hwmon/acpi_power_meter.c | 3 +-- drivers/hwmon/asus_atk0110.c | 7 +------ drivers/ide/ide-acpi.c | 1 - drivers/input/misc/atlas_btns.c | 2 +- drivers/iommu/amd_iommu_init.c | 1 - drivers/iommu/intel_irq_remapping.c | 4 ++-- drivers/pci/hotplug/acpiphp_ibm.c | 3 +-- drivers/pci/hotplug/pciehp.h | 2 -- drivers/pci/ioapic.c | 1 - drivers/pci/pci-acpi.c | 3 --- drivers/pci/pci-label.c | 1 - drivers/platform/x86/acer-wmi.c | 2 -- drivers/platform/x86/asus-laptop.c | 3 +-- drivers/platform/x86/asus-wmi.c | 3 +-- drivers/platform/x86/classmate-laptop.c | 3 +-- drivers/platform/x86/dell-wmi-aio.c | 1 - drivers/platform/x86/dell-wmi.c | 1 - drivers/platform/x86/eeepc-laptop.c | 3 +-- drivers/platform/x86/eeepc-wmi.c | 2 +- drivers/platform/x86/hp_accel.c | 2 +- drivers/platform/x86/ideapad-laptop.c | 3 +-- drivers/platform/x86/intel-rst.c | 2 +- drivers/platform/x86/intel-smartconnect.c | 2 +- drivers/platform/x86/intel_menlow.c | 4 +--- drivers/platform/x86/intel_oaktrail.c | 3 --- drivers/platform/x86/mxm-wmi.c | 3 +-- drivers/platform/x86/panasonic-laptop.c | 4 +--- drivers/platform/x86/pvpanic.c | 3 +-- drivers/platform/x86/samsung-q10.c | 2 +- drivers/platform/x86/sony-laptop.c | 4 +--- drivers/platform/x86/tc1100-wmi.c | 4 +--- drivers/platform/x86/thinkpad_acpi.c | 14 ++++---------- drivers/platform/x86/toshiba_acpi.c | 4 +--- drivers/platform/x86/toshiba_bluetooth.c | 4 +--- drivers/platform/x86/wmi.c | 2 -- drivers/platform/x86/xo15-ebook.c | 3 +-- drivers/pnp/pnpacpi/core.c | 1 - drivers/pnp/pnpacpi/pnpacpi.h | 1 - drivers/sfi/sfi_acpi.c | 2 +- drivers/staging/quickstart/quickstart.c | 2 +- drivers/usb/core/usb-acpi.c | 1 - drivers/xen/xen-acpi-cpuhotplug.c | 3 --- drivers/xen/xen-acpi-memhotplug.c | 1 - drivers/xen/xen-acpi-pad.c | 5 ++--- drivers/xen/xen-acpi-processor.c | 4 +--- include/acpi/acpi_bus.h | 2 -- include/acpi/acpi_drivers.h | 3 --- include/linux/acpi_io.h | 2 +- include/linux/ide.h | 8 ++------ include/linux/iscsi_ibft.h | 2 +- include/linux/pci_hotplug.h | 3 +-- include/linux/sfi_acpi.h | 2 +- include/linux/tboot.h | 2 +- tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 5 +---- 103 files changed, 80 insertions(+), 234 deletions(-)
arch/ia64/hp/common/aml_nfw.c +1 -2
@@ -23,8 +23,7 @@*/ #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/sal.h> MODULE_AUTHOR ("Bjorn Helgaas <[email protected]>" );
arch/x86/kernel/apic/apic_flat_64.c +1 -3
@@ -21,9 +21,7 @@#include <asm/apic.h> #include <asm/ipi.h> -#ifdef CONFIG_ACPI -#include <acpi/acpi_bus.h> -#endif +#include <linux/acpi.h> static struct apic apic_physflat;static struct apic apic_flat;
arch/x86/kernel/apic/io_apic.c +0 -3
@@ -37,9 +37,6 @@#include <linux/kthread.h> #include <linux/jiffies.h> /* time_after() */ #include <linux/slab.h> -#ifdef CONFIG_ACPI -#include <acpi/acpi_bus.h> -#endif #include <linux/bootmem.h> #include <linux/dmar.h> #include <linux/hpet.h>
arch/x86/pci/mmconfig_32.c +0 -1
@@ -14,7 +14,6 @@#include <linux/rcupdate.h> #include <asm/e820.h> #include <asm/pci_x86.h> -#include <acpi/acpi.h> /* Assume systems with more busses have correct MCFG */ #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))
arch/x86/platform/olpc/olpc-xo15-sci.c +1 -2
@@ -15,8 +15,7 @@#include <linux/power_supply.h> #include <linux/olpc-ec.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/olpc.h> #define DRV_NAME "olpc-xo15-sci"
drivers/acpi/ac.c +1 -2
@@ -32,8 +32,7 @@#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/power_supply.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "
drivers/acpi/acpi_extlog.c +0 -1
@@ -9,7 +9,6 @@#include <linux/module.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/cper.h> #include <linux/ratelimit.h> #include <asm/cpu.h>
drivers/acpi/acpi_pad.c +1 -2
@@ -28,8 +28,7 @@#include <linux/cpu.h> #include <linux/clockchips.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/mwait.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"
drivers/acpi/apei/einj.c +0 -1
@@ -33,7 +33,6 @@#include <linux/nmi.h> #include <linux/delay.h> #include <linux/mm.h> -#include <acpi/acpi.h> #include "apei-internal.h"
drivers/acpi/battery.c +1 -2
@@ -36,8 +36,7 @@#include <linux/suspend.h> #include <asm/unaligned.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/power_supply.h> #define PREFIX "ACPI: "
drivers/acpi/blacklist.c +0 -1
@@ -30,7 +30,6 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/dmi.h> #include "internal.h"
drivers/acpi/bus.c +0 -2
@@ -37,8 +37,6 @@#include <asm/mpspec.h> #endif #include <linux/pci.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h> #include <linux/dmi.h> #include <linux/suspend.h>
drivers/acpi/button.c +1 -2
@@ -31,8 +31,7 @@#include <linux/seq_file.h> #include <linux/input.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/button.h> #define PREFIX "ACPI: "
drivers/acpi/custom_method.c +1 -1
@@ -7,7 +7,7 @@#include <linux/kernel.h> #include <linux/uaccess.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h"
drivers/acpi/debugfs.c +1 -1
@@ -5,7 +5,7 @@#include <linux/export.h> #include <linux/init.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define _COMPONENT ACPI_SYSTEM_COMPONENTACPI_MODULE_NAME ("debugfs" );
drivers/acpi/dock.c +0 -2
@@ -32,8 +32,6 @@#include <linux/jiffies.h> #include <linux/stddef.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "
drivers/acpi/ec.c +2 -3
@@ -39,10 +39,9 @@#include <linux/list.h> #include <linux/spinlock.h> #include <linux/slab.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/dmi.h> +#include <asm/io.h> #include "internal.h"
drivers/acpi/event.c +1 -1
@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/poll.h> #include <linux/gfp.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <net/netlink.h> #include <net/genetlink.h>
drivers/acpi/fan.c +1 -2
@@ -29,8 +29,7 @@#include <linux/types.h> #include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "
drivers/acpi/hed.c +0 -2
@@ -25,8 +25,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/hed.h> static struct acpi_device_id acpi_hed_ids[] = {
drivers/acpi/numa.c +0 -1
@@ -29,7 +29,6 @@#include <linux/errno.h> #include <linux/acpi.h> #include <linux/numa.h> -#include <acpi/acpi_bus.h> #define PREFIX "ACPI: "
drivers/acpi/osl.c +0 -3
@@ -49,9 +49,6 @@#include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> #include "internal.h" #define _COMPONENT ACPI_OS_SERVICES
drivers/acpi/pci_irq.c +0 -2
@@ -37,8 +37,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: "
drivers/acpi/pci_link.c +1 -3
@@ -39,9 +39,7 @@#include <linux/pci.h> #include <linux/mutex.h> #include <linux/slab.h> - -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: "
drivers/acpi/pci_root.c +1 -3
@@ -35,9 +35,7 @@#include <linux/pci-aspm.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/apei.h> +#include <acpi/apei.h> /* for acpi_hest_init() */ #include "internal.h"
drivers/acpi/power.c +1 -2
@@ -42,8 +42,7 @@#include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/sysfs.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "sleep.h" #include "internal.h"
drivers/acpi/proc.c +1 -3
@@ -3,11 +3,9 @@#include <linux/export.h> #include <linux/suspend.h> #include <linux/bcd.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "sleep.h" #define _COMPONENT ACPI_SYSTEM_COMPONENT
drivers/acpi/processor_core.c +1 -2
@@ -10,8 +10,7 @@#include <linux/export.h> #include <linux/dmi.h> #include <linux/slab.h> - -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #include "internal.h"
drivers/acpi/processor_idle.c +1 -3
@@ -35,6 +35,7 @@#include <linux/clockchips.h> #include <linux/cpuidle.h> #include <linux/syscore_ops.h> +#include <acpi/processor.h> /* * Include the apic definitions for x86 to have the APIC timer related defines
@@ -46,9 +47,6 @@#include <asm/apic.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"
drivers/acpi/processor_perflib.c +2 -5
@@ -31,15 +31,12 @@#include <linux/init.h> #include <linux/cpufreq.h> #include <linux/slab.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #ifdef CONFIG_X86 #include <asm/cpufeature.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"
drivers/acpi/processor_thermal.c +2 -5
@@ -30,12 +30,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/cpufreq.h> - -#include <asm/uaccess.h> - -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <acpi/acpi_drivers.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "
drivers/acpi/processor_throttling.c +2 -5
@@ -32,14 +32,11 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/cpufreq.h> - +#include <linux/acpi.h> +#include <acpi/processor.h> #include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -#define PREFIX "ACPI: "#define ACPI_PROCESSOR_CLASS "processor"
drivers/acpi/sbshc.c +1 -2
@@ -8,8 +8,7 @@* the Free Software Foundation version 2. */ -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/wait.h> #include <linux/slab.h> #include <linux/delay.h>
drivers/acpi/scan.c +0 -2
@@ -12,8 +12,6 @@#include <linux/dmi.h> #include <linux/nls.h> -#include <acpi/acpi_drivers.h> -#include "internal.h" #define _COMPONENT ACPI_BUS_COMPONENT
drivers/acpi/sleep.c +0 -4
@@ -18,12 +18,8 @@#include <linux/reboot.h> #include <linux/acpi.h> #include <linux/module.h> -#include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include "internal.h" #include "sleep.h"
drivers/acpi/sysfs.c +1 -1
@@ -5,7 +5,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/moduleparam.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h"
drivers/acpi/thermal.c +2 -3
@@ -41,10 +41,9 @@#include <linux/kmod.h> #include <linux/reboot.h> #include <linux/device.h> -#include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> +#include <asm/uaccess.h> #define PREFIX "ACPI: "
drivers/acpi/utils.c +0 -2
@@ -30,8 +30,6 @@#include <linux/types.h> #include <linux/hardirq.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include "internal.h"
drivers/acpi/video.c +2 -3
@@ -37,12 +37,11 @@#include <linux/pci.h> #include <linux/pci_ids.h> #include <linux/slab.h> -#include <asm/uaccess.h> #include <linux/dmi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <linux/suspend.h> +#include <linux/acpi.h> #include <acpi/video.h> +#include <asm/uaccess.h> #include "internal.h"
drivers/acpi/wakeup.c +0 -1
@@ -5,7 +5,6 @@#include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <linux/kernel.h> #include <linux/types.h>
drivers/ata/libata-acpi.c +0 -2
@@ -20,8 +20,6 @@#include <scsi/scsi_device.h> #include "libata.h" -#include <acpi/acpi_bus.h> -unsigned int ata_acpi_gtf_filter =ATA_ACPI_FILTER_DEFAULT ;module_param_named (acpi_gtf_filter, ata_acpi_gtf_filter, int,0644 );MODULE_PARM_DESC (acpi_gtf_filter,"filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freeze lock, 0x4=DIPM, 0x8=FPDMA non-zero offset, 0x10=FPDMA DMA Setup FIS auto-activate)" );
drivers/ata/pata_acpi.c +2 -3
@@ -12,11 +12,10 @@#include <linux/delay.h> #include <linux/device.h> #include <linux/gfp.h> -#include <scsi/scsi_host.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #include <linux/libata.h> #include <linux/ata.h> +#include <scsi/scsi_host.h> #define DRV_NAME "pata_acpi"#define DRV_VERSION "0.2.3"
drivers/char/hpet.c +2 -5
@@ -34,15 +34,12 @@#include <linux/uaccess.h> #include <linux/slab.h> #include <linux/io.h> - +#include <linux/acpi.h> +#include <linux/hpet.h> #include <asm/current.h> #include <asm/irq.h> #include <asm/div64.h> -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/hpet.h> -/* * The High Precision Event Timer driver. * This driver is closely modelled after the rtc.c driver.
drivers/char/tpm/tpm_acpi.c +1 -1
@@ -23,7 +23,7 @@#include <linux/security.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> #include "tpm.h" #include "tpm_eventlog.h"
drivers/char/tpm/tpm_ppi.c +0 -1
@@ -1,5 +1,4 @@#include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include "tpm.h" static const u8 tpm_ppi_uuid[] = {
drivers/gpu/drm/i915/intel_acpi.c +0 -2
@@ -6,8 +6,6 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/vga_switcheroo.h> -#include <acpi/acpi_drivers.h> -#include <drm/drmP.h> #include "i915_drv.h"
drivers/gpu/drm/nouveau/nouveau_acpi.c +1 -6
@@ -1,15 +1,10 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <acpi/video.h> -#include <acpi/acpi.h> #include <linux/mxm-wmi.h> -#include <linux/vga_switcheroo.h> -#include <drm/drm_edid.h> +#include <acpi/video.h> #include "nouveau_drm.h" #include "nouveau_acpi.h"
drivers/gpu/drm/radeon/radeon_acpi.c +1 -5
@@ -25,18 +25,14 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/power_supply.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/vga_switcheroo.h> #include <acpi/video.h> -#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> #include "radeon.h" #include "radeon_acpi.h" #include "atom.h" -#include <linux/vga_switcheroo.h> -#define ACPI_AC_CLASS "ac_adapter"extern void radeon_pm_acpi_event_handler (struct radeon_device *rdev);
drivers/hv/vmbus_drv.c +0 -2
@@ -30,7 +30,6 @@#include <linux/sysctl.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/completion.h> #include <linux/hyperv.h> #include <linux/kernel_stat.h>
@@ -39,7 +38,6 @@#include <asm/mshyperv.h> #include "hyperv_vmbus.h" -static struct acpi_device *hv_acpi_dev;static struct tasklet_struct msg_dpc;
drivers/hwmon/acpi_power_meter.c +1 -2
@@ -30,8 +30,7 @@#include <linux/sched.h> #include <linux/time.h> #include <linux/err.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ACPI_POWER_METER_NAME "power_meter"ACPI_MODULE_NAME (ACPI_POWER_METER_NAME );
drivers/hwmon/asus_atk0110.c +1 -6
@@ -16,12 +16,7 @@#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/err.h> - -#include <acpi/acpi.h> -#include <acpi/acpixf.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> - +#include <linux/acpi.h> #define ATK_HID "ATK0110"
drivers/ide/ide-acpi.c +0 -1
@@ -14,7 +14,6 @@#include <linux/errno.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <acpi/acpi.h> #include <linux/ide.h> #include <linux/pci.h> #include <linux/dmi.h>
drivers/input/misc/atlas_btns.c +1 -1
@@ -28,8 +28,8 @@#include <linux/init.h> #include <linux/input.h> #include <linux/types.h> +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> #define ACPI_ATLAS_NAME "Atlas ACPI"#define ACPI_ATLAS_CLASS "Atlas"
drivers/iommu/amd_iommu_init.c +0 -1
@@ -26,7 +26,6 @@#include <linux/msi.h> #include <linux/amd-iommu.h> #include <linux/export.h> -#include <acpi/acpi.h> #include <asm/pci-direct.h> #include <asm/iommu.h> #include <asm/gart.h>
drivers/iommu/intel_irq_remapping.c +2 -2
@@ -6,11 +6,11 @@#include <linux/hpet.h> #include <linux/pci.h> #include <linux/irq.h> +#include <linux/intel-iommu.h> +#include <linux/acpi.h> #include <asm/io_apic.h> #include <asm/smp.h> #include <asm/cpu.h> -#include <linux/intel-iommu.h> -#include <acpi/acpi.h> #include <asm/irq_remapping.h> #include <asm/pci-direct.h> #include <asm/msidef.h>
drivers/pci/hotplug/acpiphp_ibm.c +1 -2
@@ -31,12 +31,11 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> -#include <acpi/acpi_bus.h> #include <linux/sysfs.h> #include <linux/kobject.h> -#include <asm/uaccess.h> #include <linux/moduleparam.h> #include <linux/pci.h> +#include <asm/uaccess.h> #include "acpiphp.h" #include "../pci.h"
drivers/pci/hotplug/pciehp.h +0 -2
@@ -163,8 +163,6 @@ static inline const char *slot_name(struct slot *slot) }#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/pci-acpi.h> void __init pciehp_acpi_slot_detection_init (void );
drivers/pci/ioapic.c +0 -1
@@ -20,7 +20,6 @@#include <linux/module.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> struct ioapic {acpi_handle handle;
drivers/pci/pci-acpi.c +0 -3
@@ -12,9 +12,6 @@#include <linux/pci.h> #include <linux/module.h> #include <linux/pci-aspm.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <linux/pci-acpi.h> #include <linux/pm_runtime.h> #include <linux/pm_qos.h>
drivers/pci/pci-label.c +0 -1
@@ -29,7 +29,6 @@#include <linux/nls.h> #include <linux/acpi.h> #include <linux/pci-acpi.h> -#include <acpi/acpi_bus.h> #include "pci.h" #define DEVICE_LABEL_DSM 0x07
drivers/platform/x86/acer-wmi.c +0 -2
@@ -41,8 +41,6 @@#include <linux/slab.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> - -#include <acpi/acpi_drivers.h> #include <acpi/video.h> MODULE_AUTHOR ("Carlos Corbacho" );
drivers/platform/x86/asus-laptop.c +1 -2
@@ -53,8 +53,7 @@#include <linux/rfkill.h> #include <linux/slab.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ASUS_LAPTOP_VERSION "0.42"
drivers/platform/x86/asus-wmi.c +1 -2
@@ -45,8 +45,7 @@#include <linux/seq_file.h> #include <linux/platform_device.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/video.h> #include "asus-wmi.h"
drivers/platform/x86/classmate-laptop.c +1 -2
@@ -21,14 +21,13 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/workqueue.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/backlight.h> #include <linux/input.h> #include <linux/rfkill.h> MODULE_LICENSE ("GPL" ); -struct cmpc_accel {int sensitivity;int g_select;
drivers/platform/x86/dell-wmi-aio.c +0 -1
@@ -24,7 +24,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h>
drivers/platform/x86/dell-wmi.c +0 -1
@@ -32,7 +32,6 @@#include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> #include <linux/dmi.h>
drivers/platform/x86/eeepc-laptop.c +1 -2
@@ -28,8 +28,7 @@#include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <linux/uaccess.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h>
drivers/platform/x86/eeepc-wmi.c +1 -1
@@ -33,7 +33,7 @@#include <linux/input/sparse-keymap.h> #include <linux/dmi.h> #include <linux/fb.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include "asus-wmi.h"
drivers/platform/x86/hp_accel.c +1 -1
@@ -36,7 +36,7 @@#include <linux/uaccess.h> #include <linux/leds.h> #include <linux/atomic.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "../../misc/lis3lv02d/lis3lv02d.h" #define DRIVER_NAME "hp_accel"
drivers/platform/x86/ideapad-laptop.c +1 -2
@@ -26,8 +26,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/platform_device.h> #include <linux/input.h>
drivers/platform/x86/intel-rst.c +1 -1
@@ -20,7 +20,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );
drivers/platform/x86/intel-smartconnect.c +1 -1
@@ -19,7 +19,7 @@#include <linux/init.h> #include <linux/module.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE ("GPL" );
drivers/platform/x86/intel_menlow.c +1 -3
@@ -36,10 +36,8 @@#include <linux/types.h> #include <linux/pci.h> #include <linux/pm.h> -#include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Thomas Sujith" );MODULE_AUTHOR ("Zhang Rui" );
drivers/platform/x86/intel_oaktrail.c +0 -3
@@ -50,9 +50,6 @@#include <linux/platform_device.h> #include <linux/dmi.h> #include <linux/rfkill.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#define DRIVER_NAME "intel_oaktrail"#define DRIVER_VERSION "0.4ac1"
drivers/platform/x86/mxm-wmi.c +1 -2
@@ -20,8 +20,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Dave Airlie" );MODULE_DESCRIPTION ("MXM WMI Driver" );
drivers/platform/x86/panasonic-laptop.c +1 -3
@@ -125,12 +125,10 @@#include <linux/seq_file.h> #include <linux/uaccess.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#ifndef ACPI_HOTKEY_COMPONENT #define ACPI_HOTKEY_COMPONENT 0x10000000#endif
drivers/platform/x86/pvpanic.c +1 -2
@@ -24,8 +24,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Hu Tao <[email protected]>" );MODULE_DESCRIPTION ("pvpanic device driver" );
drivers/platform/x86/samsung-q10.c +1 -1
@@ -15,7 +15,7 @@#include <linux/platform_device.h> #include <linux/backlight.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define SAMSUNGQ10_BL_MAX_INTENSITY 7
drivers/platform/x86/sony-laptop.c +1 -3
@@ -61,9 +61,6 @@#include <linux/workqueue.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> -#include <asm/uaccess.h> #include <linux/sonypi.h> #include <linux/sony-laptop.h> #include <linux/rfkill.h>
@@ -71,6 +68,7 @@#include <linux/poll.h> #include <linux/miscdevice.h> #endif +#include <asm/uaccess.h> #define dprintk (fmt, ...) \ do { \
drivers/platform/x86/tc1100-wmi.c +1 -3
@@ -32,9 +32,7 @@#include <linux/slab.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #define GUID "C364AC71-36DB-495A-8494-B439D472A505"
drivers/platform/x86/thinkpad_acpi.c +4 -10
@@ -61,7 +61,6 @@#include <linux/freezer.h> #include <linux/delay.h> #include <linux/slab.h> -#include <linux/nvram.h> #include <linux/proc_fs.h> #include <linux/seq_file.h>
@@ -74,21 +73,16 @@#include <linux/input.h> #include <linux/leds.h> #include <linux/rfkill.h> -#include <asm/uaccess.h> -#include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/workqueue.h> - +#include <linux/acpi.h> +#include <linux/pci_ids.h> +#include <linux/thinkpad_acpi.h> #include <sound/core.h> #include <sound/control.h> #include <sound/initval.h> - -#include <acpi/acpi_drivers.h> - -#include <linux/pci_ids.h> - -#include <linux/thinkpad_acpi.h> +#include <asm/uaccess.h> /* ThinkPad CMOS commands */ #define TP_CMOS_VOLUME_DOWN 0
drivers/platform/x86/toshiba_acpi.c +1 -3
@@ -54,11 +54,9 @@#include <linux/slab.h> #include <linux/workqueue.h> #include <linux/i8042.h> - +#include <linux/acpi.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> -MODULE_AUTHOR ("John Belmonte" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Extras Driver" );MODULE_LICENSE ("GPL" );
drivers/platform/x86/toshiba_bluetooth.c +1 -3
@@ -23,14 +23,12 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR ("Jes Sorensen <[email protected]>" );MODULE_DESCRIPTION ("Toshiba Laptop ACPI Bluetooth Enable Driver" );MODULE_LICENSE ("GPL" ); -static int toshiba_bt_rfkill_add (struct acpi_device *device);static int toshiba_bt_rfkill_remove (struct acpi_device *device);static void toshiba_bt_rfkill_notify (struct acpi_device *device,u32 event);
drivers/platform/x86/wmi.c +0 -2
@@ -37,8 +37,6 @@#include <linux/acpi.h> #include <linux/slab.h> #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> ACPI_MODULE_NAME ("wmi" );MODULE_AUTHOR ("Carlos Corbacho" );
drivers/platform/x86/xo15-ebook.c +1 -2
@@ -18,8 +18,7 @@#include <linux/init.h> #include <linux/types.h> #include <linux/input.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define MODULE_NAME "xo15-ebook"
drivers/pnp/pnpacpi/core.c +0 -1
@@ -24,7 +24,6 @@#include <linux/pnp.h> #include <linux/slab.h> #include <linux/mod_devicetable.h> -#include <acpi/acpi_bus.h> #include "../base.h" #include "pnpacpi.h"
drivers/pnp/pnpacpi/pnpacpi.h +0 -1
@@ -1,7 +1,6 @@#ifndef ACPI_PNP_H #define ACPI_PNP_H -#include <acpi/acpi_bus.h> #include <linux/acpi.h> #include <linux/pnp.h>
drivers/sfi/sfi_acpi.c +1 -1
@@ -60,7 +60,7 @@#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt#include <linux/kernel.h> -#include <acpi/acpi.h> +#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ #include <linux/sfi.h> #include "sfi_core.h"
drivers/staging/quickstart/quickstart.c +1 -1
@@ -31,7 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #include <linux/input.h>
drivers/usb/core/usb-acpi.c +0 -1
@@ -16,7 +16,6 @@#include <linux/acpi.h> #include <linux/pci.h> #include <linux/usb/hcd.h> -#include <acpi/acpi_bus.h> #include "usb.h"
drivers/xen/xen-acpi-cpuhotplug.c +0 -3
@@ -24,10 +24,7 @@#include <linux/cpu.h> #include <linux/acpi.h> #include <linux/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/processor.h> -#include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h>
drivers/xen/xen-acpi-memhotplug.c +0 -1
@@ -22,7 +22,6 @@#include <linux/init.h> #include <linux/types.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h>
drivers/xen/xen-acpi-pad.c +2 -3
@@ -18,11 +18,10 @@#include <linux/kernel.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <asm/xen/hypercall.h> +#include <linux/acpi.h> #include <xen/interface/version.h> #include <xen/xen-ops.h> +#include <asm/xen/hypercall.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
drivers/xen/xen-acpi-processor.c +1 -3
@@ -28,10 +28,8 @@#include <linux/module.h> #include <linux/types.h> #include <linux/syscore_ops.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <xen/xen.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h>
include/acpi/acpi_bus.h +0 -2
@@ -28,8 +28,6 @@#include <linux/device.h> -#include <acpi/acpi.h> -/* TBD: Make dynamic */ #define ACPI_MAX_HANDLES 10struct acpi_handle_list {
include/acpi/acpi_drivers.h +0 -3
@@ -26,9 +26,6 @@#ifndef __ACPI_DRIVERS_H__#define __ACPI_DRIVERS_H__ -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#define ACPI_MAX_STRING 80/*
include/linux/acpi_io.h +1 -1
@@ -2,7 +2,7 @@#define _ACPI_IO_H_#include <linux/io.h> -#include <acpi/acpi.h> +#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys,acpi_size size)
include/linux/ide.h +2 -6
@@ -18,14 +18,10 @@#include <linux/completion.h> #include <linux/pm.h> #include <linux/mutex.h> -#ifdef CONFIG_BLK_DEV_IDEACPI -#include <acpi/acpi.h> -#endif -#include <asm/byteorder.h> -#include <asm/io.h> -/* for request_sense */ #include <linux/cdrom.h> +#include <asm/byteorder.h> +#include <asm/io.h> #if defined(CONFIG_CRIS ) || defined(CONFIG_FRV ) || defined(CONFIG_MN10300 )# define SUPPORT_VLB_SYNC 0
include/linux/iscsi_ibft.h +1 -1
@@ -21,7 +21,7 @@#ifndef ISCSI_IBFT_H #define ISCSI_IBFT_H -#include <acpi/acpi.h> +#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ /* * Logical location of iSCSI Boot Format Table.
include/linux/pci_hotplug.h +1 -2
@@ -175,8 +175,7 @@ struct hotplug_params { };#ifdef CONFIG_ACPI -#include <acpi/acpi.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> int pci_get_hp_params (struct pci_dev *dev,struct hotplug_params *hpp);int acpi_get_hp_hw_control_from_firmware (struct pci_dev *dev,u32 flags);int acpi_pci_check_ejectable (struct pci_bus *pbus,acpi_handle handle);
include/linux/sfi_acpi.h +1 -1
@@ -60,7 +60,7 @@#define _LINUX_SFI_ACPI_H#ifdef CONFIG_SFI -#include <acpi/acpi.h> /* struct acpi_table_header */ +#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ extern int sfi_acpi_table_parse(char *signature, char *oem_id, char *oem_table_id,
include/linux/tboot.h +1 -1
@@ -34,7 +34,7 @@ enum { };#ifdef CONFIG_INTEL_TXT -#include <acpi/acpi.h> +#include <linux/acpi.h> /* used to communicate between tboot and the launched kernel */ #define TB_KEY_SIZE 64/* 512 bits */
tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +1 -4
@@ -25,12 +25,9 @@#include <linux/module.h> #include <linux/init.h> #include <linux/delay.h> - +#include <linux/acpi.h> #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -static int pm_tmr_ioport =0 ;/*helper function to safely read acpi pm timesource*/
Signature · 1 line
1.7.10
Re: [PATCH v3 2/6] ACPI: Clean up inclusions of ACPI header files
Quoted 20 lines · Lv Zheng
Replace direct inclusions of <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h> inclusions and remove some inclusions of those files that aren't necessary.First of all, <
acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h> should not be included directly from any files that are built forCONFIG_ACPIunset, because that generally leads to build warnings about undefined symbols in !CONFIG_ACPI builds. ForCONFIG_ACPIset, <linux/acpi.h> includes those files and forCONFIG_ACPIunset it provides stub ACPI symbols to be used in that case.Second, there are ordering dependencies between those files that always have to be met. Namely, it is required that <
acpi/acpi_bus.h> be included prior to <acpi/acpi_drivers.h> so that theacpi_pci_rootdeclarations the latter depends on are always there. And <acpi/acpi.h> which provides basic ACPICA type declarations should always be included prior to any other ACPI headers inCONFIG_ACPIbuilds. That also is taken care of including <linux/acpi.h> as appropriate.
Quoted 2 lines
Signed-off-by Lv Zheng <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>
Quoted 6 lines
Cc Greg Kroah-Hartman <[email protected]>Cc Matthew Garrett <[email protected]>Cc Tony Luck <[email protected]>Cc "H. Peter Anvin" <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>
.. for the Xen stuff with the assertion that you did build with the right CONFIG_XEN...=y parameters).
Thank you!
PATCH v3 3/6 SFI: Fix warnings reported by W=1 builds.
In reply to Lv ZhengThe following warnings can be seen for W=1 builds. This is because original sfi_acpi.[ch] header inclusions are wrong.
include/linux/sfi_acpi.h:72:2: error: implicit declaration of function 'acpi_table_parse' [-Werror=implicit-function-declaration] drivers/sfi/sfi_acpi.c:154:5: warning: no previous prototype for 'sfi_acpi_table_parse' [-Wmissing-prototypes]
This patch fixes this existing issue. It is on top of the following commit which doesn't take care about existing issues:
Commit: 4e8fb7987f7d0390a2e74622c7c1cbb6760c6516
From: Lv Zheng <[email protected]>
Date: Tue, 3 Dec 2013 08:49:16 +0800
Subject: [PATCH] ACPI: Clean up inclusions of ACPI header files
--- arch/x86/pci/mmconfig-shared.c | 1 - drivers/sfi/sfi_acpi.c | 4 +--- include/linux/sfi_acpi.h | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/pci/mmconfig-shared.c +0 -1
@@ -12,7 +12,6 @@#include <linux/pci.h> #include <linux/init.h> -#include <linux/acpi.h> #include <linux/sfi_acpi.h> #include <linux/bitmap.h> #include <linux/dmi.h>
drivers/sfi/sfi_acpi.c +1 -3
@@ -60,9 +60,7 @@#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt#include <linux/kernel.h> -#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ - -#include <linux/sfi.h> +#include <linux/sfi_acpi.h> #include "sfi_core.h" /*
include/linux/sfi_acpi.h +3 -0
@@ -59,6 +59,9 @@#ifndef _LINUX_SFI_ACPI_H#define _LINUX_SFI_ACPI_H +#include <linux/acpi.h> +#include <linux/sfi.h> +#ifdef CONFIG_SFI #include <acpi/acpi.h> /* FIXME: inclusion should be removed */
Signature · 1 line
1.7.10
PATCH v3 4/6 ACPI/i915: Fix wrong <acpi/acpi.h> inclusion in i915 opregion module.
In reply to Lv ZhengIn Linux kernel, ACPICA is wrapped and safely exported by CONFIG_ACPI. So all external modules should depend on CONFIG_ACPI rather than using ACPICA header directly for stubbing. But if we moves <acpi/acpi.h> inclusions into "#ifdef CONFIG_ACPI", build breakge can help to detect wrong ACPICA dependent modules.
One of the build breakage is:include/linux/acpi_io.h:7:45: error: unknown type name 'acpi_physical_address'include/linux/acpi_io.h:8:10: error: unknown type name 'acpi_size'include/linux/acpi_io.h:13:33: error: unknown type name 'acpi_physical_address'include/linux/acpi_io.h:15:40: warning: 'struct acpi_generic_address' declared inside parameter list [enabled by default] include/linux/acpi_io.h:15:40: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] include/linux/acpi_io.h:16:43: warning: 'struct acpi_generic_address' declared inside parameter list [enabled by default] drivers/gpu/drm/i915/intel_opregion.c: In function 'intel_opregion_setup':drivers/gpu/drm/i915/intel_opregion.c:883:2: error: implicit declaration of function 'acpi_os_ioremap' [-Werror=implicit-function-declaration] drivers/gpu/drm/i915/intel_opregion.c:883:7: warning: assignment makes pointer from integer without a cast [enabled by default]
The root causes of this breakage are:
1. The <linux/acpi_io.h> depends on CONFIG_ACPI=y as most of the prototypes exported by it are implemented in drivers/acpi/osl.c.
2. CONFIG_DRM_I915 uses the only "inline" function acpi_os_ioremap() to implement stubs but it shouldn't.
Since ACPI IGD OpRegion is an ACPI-based mechanism, (please refer to the Doclink below), this patch fixes this issue by making drivers/gpu/drm/i915/intel_opregion.c dependent on CONFIG_ACPI. This is identical to other Intel DRM drivers' OpRegion support (e.x., drivers/gpu/drm/gma500/opregion.c).
Since acpi_io.h is not safe for CONFIG_ACPI=y environment, this patch also moves it to include/acpi, includes it in <linux/acpi.h> for CONFIG_ACPI=y build environment and cleans up its inclusions by converting them into <linux/acpi.h> inclusions.
After that, since all <acpi/acpi_io.h> inclusions are CONFIG_ACPI dependent, the FIXME marked <acpi/acpi.h> inclusion in <acpi/acpi_io.h> is also deleted in this patch.
Doclink: https://01.org/linuxgraphics/sites/default/files/documentation/acpi_igd_opregion_spec.pdf
--- drivers/acpi/apei/apei-base.c | 1 - drivers/acpi/apei/apei-internal.h | 1 - drivers/acpi/apei/ghes.c | 1 - drivers/acpi/nvs.c | 1 - drivers/acpi/osl.c | 1 - drivers/gpu/drm/gma500/opregion.c | 1 - drivers/gpu/drm/i915/Makefile | 3 +-- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/intel_opregion.c | 1 - include/acpi/acpi_io.h | 17 +++++++++++++++++ include/linux/acpi.h | 1 + include/linux/acpi_io.h | 18 ------------------ 12 files changed, 21 insertions(+), 28 deletions(-) create mode 100644 include/acpi/acpi_io.h delete mode 100644 include/linux/acpi_io.h
drivers/acpi/apei/apei-base.c +0 -1
@@ -34,7 +34,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> #include <linux/slab.h> #include <linux/io.h> #include <linux/kref.h>
drivers/acpi/apei/apei-internal.h +0 -1
@@ -8,7 +8,6 @@#include <linux/cper.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> struct apei_exec_context ;
drivers/acpi/apei/ghes.c +0 -1
@@ -33,7 +33,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> #include <linux/io.h> #include <linux/interrupt.h> #include <linux/timer.h>
drivers/acpi/nvs.c +0 -1
@@ -12,7 +12,6 @@#include <linux/mm.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> /* ACPI NVS regions, APEI may use it */
drivers/acpi/osl.c +0 -1
@@ -39,7 +39,6 @@#include <linux/workqueue.h> #include <linux/nmi.h> #include <linux/acpi.h> -#include <linux/acpi_io.h> #include <linux/efi.h> #include <linux/ioport.h> #include <linux/list.h>
drivers/gpu/drm/gma500/opregion.c +0 -1
@@ -22,7 +22,6 @@* */ #include <linux/acpi.h> -#include <linux/acpi_io.h> #include "psb_drv.h" #include "psb_intel_reg.h"
drivers/gpu/drm/i915/Makefile +1 -2
@@ -38,7 +38,6 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \ intel_ringbuffer.o \ intel_overlay.o \ intel_sprite.o \ - intel_opregion.o \ intel_sideband.o \ intel_uncore.o \ dvo_ch7xxx.o \
@@ -51,7 +50,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \ i915-$(CONFIG_COMPAT) += i915_ioc32.o -i915-$(CONFIG_ACPI) += intel_acpi.o +i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -2336,8 +2336,8 @@ extern void intel_i2c_reset(struct drm_device *dev);/* intel_opregion.c */ struct intel_encoder ; -extern int intel_opregion_setup (struct drm_device *dev);#ifdef CONFIG_ACPI +extern int intel_opregion_setup (struct drm_device *dev);extern void intel_opregion_init (struct drm_device *dev);extern void intel_opregion_fini (struct drm_device *dev);extern void intel_opregion_asle_intr (struct drm_device *dev);
@@ -2346,6 +2346,7 @@ extern int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,extern int intel_opregion_notify_adapter (struct drm_device *dev,pci_power_t state);#else +static inline int intel_opregion_setup (struct drm_device *dev) {return 0 ; }static inline void intel_opregion_init (struct drm_device *dev) {return ; }static inline void intel_opregion_fini (struct drm_device *dev) {return ; }static inline void intel_opregion_asle_intr (struct drm_device *dev) {return ; }
drivers/gpu/drm/i915/intel_opregion.c +0 -1
@@ -28,7 +28,6 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt#include <linux/acpi.h> -#include <linux/acpi_io.h> #include <acpi/video.h> #include <drm/drmP.h>
include/acpi/acpi_io.h new file +17 -0
@@ -0,0 +1,17 @@ +#ifndef _ACPI_IO_H_ +#define _ACPI_IO_H_ + +#include <linux/io.h> + +static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys, +acpi_size size) +{ +return ioremap_cache (phys, size); +} + +void __iomem *acpi_os_get_iomem (acpi_physical_address phys,unsigned int size); + +int acpi_os_map_generic_address (struct acpi_generic_address *addr); +void acpi_os_unmap_generic_address (struct acpi_generic_address *addr); + +#endif
include/linux/acpi.h +1 -0
@@ -42,6 +42,7 @@#include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_numa.h> +#include <acpi/acpi_io.h> #include <asm/acpi.h> static inline acpi_handle acpi_device_handle (struct acpi_device *adev)
include/linux/acpi_io.h deleted +0 -18
@@ -1,18 +0,0 @@ -#ifndef _ACPI_IO_H_ -#define _ACPI_IO_H_ - -#include <linux/io.h> -#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ - -static inline void __iomem *acpi_os_ioremap (acpi_physical_address phys, -acpi_size size) -{ -return ioremap_cache (phys, size); -} - -void __iomem *acpi_os_get_iomem (acpi_physical_address phys,unsigned int size); - -int acpi_os_map_generic_address (struct acpi_generic_address *addr); -void acpi_os_unmap_generic_address (struct acpi_generic_address *addr); - -#endif
Signature · 1 line
1.7.10
PATCH v3 5/6 ACPI/SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper - acpi_disabled linkage.
In reply to Lv ZhengIn Linux kernel, ACPICA is wrapped and safely exported by CONFIG_ACPI. So all external modules should depend on CONFIG_ACPI rather than using ACPICA header directly for stubbing. But if we moves <acpi/acpi.h> inclusions into "#ifdef CONFIG_ACPI", build breakge can help to detect wrong ACPICA dependent modules.
One of the build breakage is:arch/x86/pci/mmconfig-shared.c:389:1: error: unknown type name 'acpi_status'arch/x86/pci/mmconfig-shared.c:389:47: warning: 'struct acpi_resource' declared inside parameter list [enabled by default] arch/x86/pci/mmconfig-shared.c:389:47: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] arch/x86/pci/mmconfig-shared.c: In function 'check_mcfg_resource':arch/x86/pci/mmconfig-shared.c:392:33: error: storage size of 'address' isn't knownarch/x86/pci/mmconfig-shared.c:393:2: error: unknown type name 'acpi_status'arch/x86/pci/mmconfig-shared.c:395:9: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:395:19: error: 'ACPI_RESOURCE_TYPE_FIXED_MEMORY32' undeclared (first use in this function) arch/x86/pci/mmconfig-shared.c:395:19: note: each undeclared identifier is reported only once for each function it appears in arch/x86/pci/mmconfig-shared.c:397:8: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:399:11: error: 'AE_OK' undeclared (first use in this function) arch/x86/pci/mmconfig-shared.c:400:35: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:401:33: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:402:19: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:404:11: error: 'AE_CTRL_TERMINATE' undeclared (first use in this function) arch/x86/pci/mmconfig-shared.c:407:10: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:407:20: error: 'ACPI_RESOURCE_TYPE_ADDRESS32' undeclared (first use in this function) arch/x86/pci/mmconfig-shared.c:408:10: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:408:20: error: 'ACPI_RESOURCE_TYPE_ADDRESS64' undeclared (first use in this function) arch/x86/pci/mmconfig-shared.c:411:2: error: implicit declaration of function 'acpi_resource_to_address64' [-Werror=implicit-function-declaration] arch/x86/pci/mmconfig-shared.c:412:2: error: implicit declaration of function 'ACPI_FAILURE' [-Werror=implicit-function-declaration] arch/x86/pci/mmconfig-shared.c:414:31: error: 'ACPI_MEMORY_RANGE' undeclared (first use in this function) arch/x86/pci/mmconfig-shared.c:392:33: warning: unused variable 'address' [-Wunused-variable]arch/x86/pci/mmconfig-shared.c: At top level:arch/x86/pci/mmconfig-shared.c:425:1: error: unknown type name 'acpi_status'arch/x86/pci/mmconfig-shared.c:425:41: error: unknown type name 'acpi_handle'arch/x86/pci/mmconfig-shared.c: In function 'is_acpi_reserved':arch/x86/pci/mmconfig-shared.c:447:2: error: implicit declaration of function 'acpi_get_devices' [-Werror=implicit-function-declaration] arch/x86/pci/mmconfig-shared.c:447:30: error: 'find_mboard_resource' undeclared (first use in this function) arch/x86/pci/mmconfig-shared.c: At top level:arch/x86/pci/mmconfig-shared.c:389:20: warning: 'check_mcfg_resource' defined but not used [-Wunused-function]
The root cause of this breakage is:
1. The following commit doesn't protect ACPICA functions like acpi_get_devices()/acpi_walk_resources()/acpi_resource_to_address64() in CONFIG_SFI=y and CONFIG_ACPI=n environment:
Commit: 5f0db7a2fb78895a197f64e548333b3bbd433996
Author: Feng Tang <[email protected]>
Subject: SFI: Hook PCI MMCONFIG
First check ACPI, and if that fails, ask SFI to find the MCFG.
So it actually depends on the logic that in !CONFIG_ACPI builds, code blocks under "if (!acpi_disabled)" will not be linked in.
This patch fixes this issue by introducing a stub for MCFG entry checker is_acpi_reserved() in !CONFIG_ACPI builds.
--- arch/x86/pci/mmconfig-shared.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/x86/pci/mmconfig-shared.c +7 -0
@@ -369,6 +369,7 @@ static int __init pci_mmcfg_check_hostbridge(void)return !list_empty (&pci_mmcfg_list); } +#ifdef CONFIG_ACPI static acpi_status check_mcfg_resource (struct acpi_resource *res,void *data) {struct resource *mcfg_res = data;
@@ -435,6 +436,12 @@ static int is_acpi_reserved(u64 start, u64 end, unsigned not_used) return mcfg_res.flags; } +#else +static inline int is_acpi_reserved (u64 start,u64 end,unsigned not_used) +{ +return 0 ; +} +#endif typedef int (*check_reserved_t )(u64 start,u64 end,unsigned type);
Signature · 1 line
1.7.10
RE: [PATCH v3 5/6] ACPI/SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper - acpi_disabled linkage.
Hi,
Quoted 37 lines
From: Zheng, Lv
Sent: Friday, December 06, 2013 4:52 PM
To: Wysocki, Rafael J; Brown, LenIn Linux kernel, ACPICA is wrapped and safely exported by
CONFIG_ACPI. So all external modules should depend onCONFIG_ACPIrather than using ACPICA header directly for stubbing. But if we moves <acpi/acpi.h> inclusions into "#ifdefCONFIG_ACPI", build breakge can help to detect wrong ACPICA dependent modules.One of the build breakage is:
arch/x86/pci/mmconfig-shared.c:389:1: error: unknown type name 'acpi_status'arch/x86/pci/mmconfig-shared.c:389:47: warning: 'structacpi_resource' declared inside parameter list [enabled by default]arch/x86/pci/mmconfig-shared.c:389:47: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]arch/x86/pci/mmconfig-shared.c: In function 'check_mcfg_resource':arch/x86/pci/mmconfig-shared.c:392:33: error: storage size of 'address' isn't knownarch/x86/pci/mmconfig-shared.c:393:2: error: unknown type name 'acpi_status'arch/x86/pci/mmconfig-shared.c:395:9: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:395:19: error: 'ACPI_RESOURCE_TYPE_FIXED_MEMORY32' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:395:19: note: each undeclared identifier is reported only once for each function it appears inarch/x86/pci/mmconfig-shared.c:397:8: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:399:11: error: 'AE_OK' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:400:35: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:401:33: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:402:19: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:404:11: error: 'AE_CTRL_TERMINATE' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:407:10: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:407:20: error: 'ACPI_RESOURCE_TYPE_ADDRESS32' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:408:10: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:408:20: error: 'ACPI_RESOURCE_TYPE_ADDRESS64' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:411:2: error: implicit declaration of function 'acpi_resource_to_address64' [-Werror=implicit- function-declaration]arch/x86/pci/mmconfig-shared.c:412:2: error: implicit declaration of function 'ACPI_FAILURE' [-Werror=implicit-function-declaration]arch/x86/pci/mmconfig-shared.c:414:31: error: 'ACPI_MEMORY_RANGE' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:392:33: warning: unused variable 'address' [-Wunused-variable]arch/x86/pci/mmconfig-shared.c: At top level:
Quoted 8 lines
arch/x86/pci/mmconfig-shared.c:425:1: error: unknown type name 'acpi_status'arch/x86/pci/mmconfig-shared.c:425:41: error: unknown type name 'acpi_handle'arch/x86/pci/mmconfig-shared.c: In function 'is_acpi_reserved':arch/x86/pci/mmconfig-shared.c:447:2: error: implicit declaration of function 'acpi_get_devices' [-Werror=implicit-function- declaration]arch/x86/pci/mmconfig-shared.c:447:30: error: 'find_mboard_resource' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c: At top level:arch/x86/pci/mmconfig-shared.c:389:20: warning: 'check_mcfg_resource' defined but not used [-Wunused-function]
Let me say something about this error messages. Someone may face difficulties to reproduce it.
Currently, this message cannot be seen in any kernel build.
This is because this patch series doesn't include a fix to remove <acpi/acpi.h> inclusion from linux/sfi_acpi.h.
To achieve this, I have offered 2 options:
1. Redefining ACPICA table stuff for CONFIG_ACPI=n environment, or
2. Implementing stubs for all ACPICA functions/globals/macros and introducing <linux/acpica.h> (where acpi/acpi.h is included) as a top level header.
3. Other solutions...
If we choose solution 1, then this issue is exposed by a build test where CONFIG_ACPI=n and CONFIG_SFI=y.
Since we haven't decided what to do for the table structures and it is really not a good approach to achieve the build safety for mmconfig-share.c by relying on link-stage optimization rather than compile-stage referencing. IMO, we need to sort it out, thus I make it a part of this patchset.
Well, if we choose solution 2, this patch can only help to reduce the size of the kernel image.
Thanks and best regards
-Lv
Quoted 52 lines
The root cause of this breakage is:
1. The following commit doesn't protect ACPICA functions like acpi_get_devices()/acpi_walk_resources()/acpi_resource_to_address64() inCONFIG_SFI=yandCONFIG_ACPI=nenvironment:
Commit:5f0db7a2fb78895a197f64e548333b3bbd433996
Author: Feng Tang <[email protected]>
Subject: SFI: Hook PCI MMCONFIG
First check ACPI, and if that fails, ask SFI to find the MCFG.
So it actually depends on the logic that in !CONFIG_ACPI builds, code blocks under "if (!acpi_disabled)" will not be linked in.This patch fixes this issue by introducing a stub for MCFG entry checker
is_acpi_reserved()in !CONFIG_ACPI builds.Signed-off-by Lv Zheng <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Len Brown <[email protected]>Cc Feng Tang <[email protected]>--- arch/x86/pci/mmconfig-shared.c | 7 +++++++ 1 file changed, 7 insertions(+)arch/x86/pci/mmconfig-shared.c +7
-1@@ -369,6 +369,7 @@ static int __init pci_mmcfg_check_hostbridge(void)return !list_empty (&pci_mmcfg_list); } +#ifdef CONFIG_ACPI static acpi_status check_mcfg_resource (struct acpi_resource *res,void *data) {struct resource *mcfg_res = data;@@ -435,6 +436,12 @@ static int is_acpi_reserved(u64 start, u64 end, unsigned not_used) return mcfg_res.flags; } +#else +static inline int is_acpi_reserved (u64 start,u64 end,unsigned not_used) +{ +return 0 ; +} +#endif typedef int (*check_reserved_t )(u64 start,u64 end,unsigned type); --1.7.10
Bjorn Helgaas
maintainerRe: [PATCH v3 5/6] ACPI/SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper - acpi_disabled linkage.
Quoted 56 lines · Lv
Hi,
Quoted 37 lines
From: Zheng, Lv
Sent: Friday, December 06, 2013 4:52 PM
To: Wysocki, Rafael J; Brown, LenIn Linux kernel, ACPICA is wrapped and safely exported by
CONFIG_ACPI. So all external modules should depend onCONFIG_ACPIrather than using ACPICA header directly for stubbing. But if we moves <acpi/acpi.h> inclusions into "#ifdefCONFIG_ACPI", build breakge can help to detect wrong ACPICA dependent modules.One of the build breakage is:
arch/x86/pci/mmconfig-shared.c:389:1: error: unknown type name 'acpi_status'arch/x86/pci/mmconfig-shared.c:389:47: warning: 'structacpi_resource' declared inside parameter list [enabled by default]arch/x86/pci/mmconfig-shared.c:389:47: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]arch/x86/pci/mmconfig-shared.c: In function 'check_mcfg_resource':arch/x86/pci/mmconfig-shared.c:392:33: error: storage size of 'address' isn't knownarch/x86/pci/mmconfig-shared.c:393:2: error: unknown type name 'acpi_status'arch/x86/pci/mmconfig-shared.c:395:9: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:395:19: error: 'ACPI_RESOURCE_TYPE_FIXED_MEMORY32' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:395:19: note: each undeclared identifier is reported only once for each function it appears inarch/x86/pci/mmconfig-shared.c:397:8: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:399:11: error: 'AE_OK' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:400:35: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:401:33: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:402:19: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:404:11: error: 'AE_CTRL_TERMINATE' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:407:10: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:407:20: error: 'ACPI_RESOURCE_TYPE_ADDRESS32' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:408:10: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:408:20: error: 'ACPI_RESOURCE_TYPE_ADDRESS64' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:411:2: error: implicit declaration of function 'acpi_resource_to_address64' [-Werror=implicit- function-declaration]arch/x86/pci/mmconfig-shared.c:412:2: error: implicit declaration of function 'ACPI_FAILURE' [-Werror=implicit-function-declaration]arch/x86/pci/mmconfig-shared.c:414:31: error: 'ACPI_MEMORY_RANGE' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:392:33: warning: unused variable 'address' [-Wunused-variable]arch/x86/pci/mmconfig-shared.c: At top level:Quoted 8 lines
arch/x86/pci/mmconfig-shared.c:425:1: error: unknown type name 'acpi_status'arch/x86/pci/mmconfig-shared.c:425:41: error: unknown type name 'acpi_handle'arch/x86/pci/mmconfig-shared.c: In function 'is_acpi_reserved':arch/x86/pci/mmconfig-shared.c:447:2: error: implicit declaration of function 'acpi_get_devices' [-Werror=implicit-function- declaration]arch/x86/pci/mmconfig-shared.c:447:30: error: 'find_mboard_resource' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c: At top level:arch/x86/pci/mmconfig-shared.c:389:20: warning: 'check_mcfg_resource' defined but not used [-Wunused-function]Let me say something about this error messages. Someone may face difficulties to reproduce it.
Currently, this message cannot be seen in any kernel build.
This is because this patch series doesn't include a fix to remove <acpi/acpi.h> inclusion fromlinux/sfi_acpi.h.
To achieve this, I have offered 2 options:
1. Redefining ACPICA table stuff forCONFIG_ACPI=nenvironment, or
2. Implementing stubs for all ACPICA functions/globals/macros and introducing <linux/acpica.h> (whereacpi/acpi.his included) as a top level header.
3. Other solutions...
Quoted 4 lines
If we choose solution 1, then this issue is exposed by a build test where
CONFIG_ACPI=nandCONFIG_SFI=y.
Since we haven't decided what to do for the table structures and it is really not a good approach to achieve the build safety formmconfig-share.cby relying on link-stage optimization rather than compile-stage referencing. IMO, we need to sort it out, thus I make it a part of this patchset.Well, if we choose solution 2, this patch can only help to reduce the size of the kernel image.
OK, I assume you will make sure one of these fixes gets merged before the change that causes the breakage, so bisection continues to work. Therefore, I think it's best if both changes are merged through the same tree, and I won't apply this via the PCI tree. Let me know if you need me to do something.
Bjorn
Quoted 53 lines
Quoted 52 lines
The root cause of this breakage is:
1. The following commit doesn't protect ACPICA functions like acpi_get_devices()/acpi_walk_resources()/acpi_resource_to_address64() inCONFIG_SFI=yandCONFIG_ACPI=nenvironment:
Commit:5f0db7a2fb78895a197f64e548333b3bbd433996
Author: Feng Tang <[email protected]>
Subject: SFI: Hook PCI MMCONFIG
First check ACPI, and if that fails, ask SFI to find the MCFG.
So it actually depends on the logic that in !CONFIG_ACPI builds, code blocks under "if (!acpi_disabled)" will not be linked in.This patch fixes this issue by introducing a stub for MCFG entry checker
is_acpi_reserved()in !CONFIG_ACPI builds.Signed-off-by Lv Zheng <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Len Brown <[email protected]>Cc Feng Tang <[email protected]>--- arch/x86/pci/mmconfig-shared.c | 7 +++++++ 1 file changed, 7 insertions(+)arch/x86/pci/mmconfig-shared.c +7
-1@@ -369,6 +369,7 @@ static int __init pci_mmcfg_check_hostbridge(void)return !list_empty (&pci_mmcfg_list); } +#ifdef CONFIG_ACPI static acpi_status check_mcfg_resource (struct acpi_resource *res,void *data) {struct resource *mcfg_res = data;@@ -435,6 +436,12 @@ static int is_acpi_reserved(u64 start, u64 end, unsigned not_used) return mcfg_res.flags; } +#else +static inline int is_acpi_reserved (u64 start,u64 end,unsigned not_used) +{ +return 0 ; +} +#endif typedef int (*check_reserved_t )(u64 start,u64 end,unsigned type); --1.7.10
Re: [PATCH v3 5/6] ACPI/SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper - acpi_disabled linkage.
Quoted 60 lines · Bjorn Helgaas
Quoted 59 lines · Lv
Hi,
Quoted 37 lines
From: Zheng, Lv
Sent: Friday, December 06, 2013 4:52 PM
To: Wysocki, Rafael J; Brown, LenIn Linux kernel, ACPICA is wrapped and safely exported by
CONFIG_ACPI. So all external modules should depend onCONFIG_ACPIrather than using ACPICA header directly for stubbing. But if we moves <acpi/acpi.h> inclusions into "#ifdefCONFIG_ACPI", build breakge can help to detect wrong ACPICA dependent modules.One of the build breakage is:
arch/x86/pci/mmconfig-shared.c:389:1: error: unknown type name 'acpi_status'arch/x86/pci/mmconfig-shared.c:389:47: warning: 'structacpi_resource' declared inside parameter list [enabled by default]arch/x86/pci/mmconfig-shared.c:389:47: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]arch/x86/pci/mmconfig-shared.c: In function 'check_mcfg_resource':arch/x86/pci/mmconfig-shared.c:392:33: error: storage size of 'address' isn't knownarch/x86/pci/mmconfig-shared.c:393:2: error: unknown type name 'acpi_status'arch/x86/pci/mmconfig-shared.c:395:9: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:395:19: error: 'ACPI_RESOURCE_TYPE_FIXED_MEMORY32' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:395:19: note: each undeclared identifier is reported only once for each function it appears inarch/x86/pci/mmconfig-shared.c:397:8: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:399:11: error: 'AE_OK' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:400:35: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:401:33: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:402:19: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:404:11: error: 'AE_CTRL_TERMINATE' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:407:10: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:407:20: error: 'ACPI_RESOURCE_TYPE_ADDRESS32' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:408:10: error: dereferencing pointer to incomplete typearch/x86/pci/mmconfig-shared.c:408:20: error: 'ACPI_RESOURCE_TYPE_ADDRESS64' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:411:2: error: implicit declaration of function 'acpi_resource_to_address64' [-Werror=implicit- function-declaration]arch/x86/pci/mmconfig-shared.c:412:2: error: implicit declaration of function 'ACPI_FAILURE' [-Werror=implicit-function-declaration]arch/x86/pci/mmconfig-shared.c:414:31: error: 'ACPI_MEMORY_RANGE' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c:392:33: warning: unused variable 'address' [-Wunused-variable]arch/x86/pci/mmconfig-shared.c: At top level:Quoted 8 lines
arch/x86/pci/mmconfig-shared.c:425:1: error: unknown type name 'acpi_status'arch/x86/pci/mmconfig-shared.c:425:41: error: unknown type name 'acpi_handle'arch/x86/pci/mmconfig-shared.c: In function 'is_acpi_reserved':arch/x86/pci/mmconfig-shared.c:447:2: error: implicit declaration of function 'acpi_get_devices' [-Werror=implicit-function- declaration]arch/x86/pci/mmconfig-shared.c:447:30: error: 'find_mboard_resource' undeclared (first use in this function)arch/x86/pci/mmconfig-shared.c: At top level:arch/x86/pci/mmconfig-shared.c:389:20: warning: 'check_mcfg_resource' defined but not used [-Wunused-function]Let me say something about this error messages. Someone may face difficulties to reproduce it.
Currently, this message cannot be seen in any kernel build.
This is because this patch series doesn't include a fix to remove <acpi/acpi.h> inclusion fromlinux/sfi_acpi.h.
To achieve this, I have offered 2 options:
1. Redefining ACPICA table stuff forCONFIG_ACPI=nenvironment, or
2. Implementing stubs for all ACPICA functions/globals/macros and introducing <linux/acpica.h> (whereacpi/acpi.his included) as a top level header.
3. Other solutions...If we choose solution 1, then this issue is exposed by a build test where
CONFIG_ACPI=nandCONFIG_SFI=y.
Since we haven't decided what to do for the table structures and it is really not a good approach to achieve the build safety formmconfig-share.cby relying on link-stage optimization rather than compile-stage referencing. IMO, we need to sort it out, thus I make it a part of this patchset.
Quoted 7 lines
Quoted 1 line
Well, if we choose solution 2, this patch can only help to reduce the size of the kernel image.
OK, I assume you will make sure one of these fixes gets merged before the change that causes the breakage, so bisection continues to work. Therefore, I think it's best if both changes are merged through the same tree, and I won't apply this via the PCI tree. Let me know if you need me to do something.
We're doing our best not to break compilation between the patches in this series. And I'll take care of it. :-)
Thanks,
Rafael
PATCH v3 6/6 ACPI/IBFT: Fix wrong <acpi/acpi.h> inclusion in iSCSI boot firmware module.
In reply to Lv ZhengIn Linux kernel, ACPICA is wrapped and safely exported by CONFIG_ACPI. So all external modules should depend on CONFIG_ACPI rather than using ACPICA header directly for stubbing. But if we moves <acpi/acpi.h> inclusions into "#ifdef CONFIG_ACPI", build breakge can help to detect wrong ACPICA dependent modules.
One of the build breakage is:drivers/firmware/iscsi_ibft_find.c: In function 'find_ibft_region':drivers/firmware/iscsi_ibft_find.c:106:12: error: dereferencing pointer to incomplete type drivers/firmware/iscsi_ibft_find.c:106:12: error: dereferencing pointer to incomplete type drivers/firmware/iscsi_ibft_find.c:106:12: error: dereferencing pointer to incomplete type
The root cause of this breakage is:
1. iBFT locating is implemented by looking up it in the memory. This is based on the specification. Specification doesn't mention if it can appear on a non-ACPI platforms but mentions it is defined in ACPI 3.0b. The current CONFIG_ISCSI_IBFT_FIND doesn't use ACPI table APIs to locate the table, thus it doesn't rely on CONFIG_ACPI.
Since ACPI iSCSI Boot Firmware is an ACPI-based mechanism (please refer to the Doclink below), we can make CONFIG_ISCSI_IBFT_FIND dependent on CONFIG_ACPI though the locating mechanism can be implemented without using ACPI table APIs. But please let me know if this is wrong.
Doclink: http://www.microsoft.com/whdc/system/platform/firmware/ibft.mspx
--- drivers/firmware/Kconfig | 2 +- include/linux/iscsi_ibft.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/Kconfig +1 -1
@@ -110,7 +110,7 @@ config DMI_SYSFS config ISCSI_IBFT_FIND bool "iSCSI Boot Firmware Table Attributes" - depends on X86 + depends on X86 && ACPI default n help This option enables the kernel to find the region of memory
include/linux/iscsi_ibft.h +1 -1
@@ -21,7 +21,7 @@#ifndef ISCSI_IBFT_H #define ISCSI_IBFT_H -#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ +#include <linux/acpi.h> /* * Logical location of iSCSI Boot Format Table.
Signature · 1 line
1.7.10
RE: [PATCH v3 6/6] ACPI/IBFT: Fix wrong <acpi/acpi.h> inclusion in iSCSI boot firmware module.
Quoted 22 lines
From: Zheng, Lv
Sent: Friday, December 06, 2013 4:52 PMIn Linux kernel, ACPICA is wrapped and safely exported by
CONFIG_ACPI. So all external modules should depend onCONFIG_ACPIrather than using ACPICA header directly for stubbing. But if we moves <acpi/acpi.h> inclusions into "#ifdefCONFIG_ACPI", build breakge can help to detect wrong ACPICA dependent modules.One of the build breakage is:
drivers/firmware/iscsi_ibft_find.c: In function 'find_ibft_region':drivers/firmware/iscsi_ibft_find.c:106:12: error: dereferencing pointer to incomplete typedrivers/firmware/iscsi_ibft_find.c:106:12: error: dereferencing pointer to incomplete typedrivers/firmware/iscsi_ibft_find.c:106:12: error: dereferencing pointer to incomplete typeThe root cause of this breakage is:
1. iBFT locating is implemented by looking up it in the memory. This is based on the specification. Specification doesn't mention if it can appear on a non-ACPI platforms but mentions it is defined in ACPI 3.0b. The currentCONFIG_ISCSI_IBFT_FINDdoesn't use ACPI table APIs to locate the table, thus it doesn't rely onCONFIG_ACPI.
Quoted 4 lines
Since ACPI iSCSI Boot Firmware is an ACPI-based mechanism (please refer to the Doclink below), we can make
CONFIG_ISCSI_IBFT_FINDdependent onCONFIG_ACPIthough the locating mechanism can be implemented without using ACPI table APIs. But please let me know if this is wrong.
Ping Konrad or Peter, will this fix mess up some situations?
Originally, this patch is marked as RFC.
But since I can see it in linux-pm/bleeding-edge branch and this patchset refreshes what have been accepted, I took the "RFC" off.
Thanks and best regards
-Lv
Quoted 38 lines
Doclink: http://www.microsoft.com/whdc/system/platform/firmware/ibft.mspx
Cc Konrad Rzeszutek Wilk <[email protected]>Cc Peter Jones <[email protected]>Signed-off-by Lv Zheng <[email protected]>--- drivers/firmware/Kconfig | 2 +- include/linux/iscsi_ibft.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/firmware/Kconfig +1
-1@@ -110,7 +110,7 @@ config DMI_SYSFS config ISCSI_IBFT_FIND bool "iSCSI Boot Firmware Table Attributes" - depends on X86 + depends on X86 && ACPI default n help This option enables the kernel to find the region of memoryinclude/linux/iscsi_ibft.h +1
-2@@ -21,7 +21,7 @@#ifndef ISCSI_IBFT_H #define ISCSI_IBFT_H -#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ +#include <linux/acpi.h> /* * Logical location of iSCSI Boot Format Table. -- 1.7.10