![Tejun Heo](/assets/img/avatar_default.png)
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
141 lines
4.2 KiB
C
141 lines
4.2 KiB
C
/*
|
|
* ACPI related functions for PCI Express Hot Plug driver.
|
|
*
|
|
* Copyright (C) 2008 Kenji Kaneshige
|
|
* Copyright (C) 2008 Fujitsu Limited.
|
|
*
|
|
* All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
|
* NON INFRINGEMENT. See the GNU General Public License for more
|
|
* details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*
|
|
*/
|
|
|
|
#include <linux/acpi.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/pci_hotplug.h>
|
|
#include <linux/slab.h>
|
|
#include "pciehp.h"
|
|
|
|
#define PCIEHP_DETECT_PCIE (0)
|
|
#define PCIEHP_DETECT_ACPI (1)
|
|
#define PCIEHP_DETECT_AUTO (2)
|
|
#define PCIEHP_DETECT_DEFAULT PCIEHP_DETECT_AUTO
|
|
|
|
struct dummy_slot {
|
|
u32 number;
|
|
struct list_head list;
|
|
};
|
|
|
|
static int slot_detection_mode;
|
|
static char *pciehp_detect_mode;
|
|
module_param(pciehp_detect_mode, charp, 0444);
|
|
MODULE_PARM_DESC(pciehp_detect_mode,
|
|
"Slot detection mode: pcie, acpi, auto\n"
|
|
" pcie - Use PCIe based slot detection\n"
|
|
" acpi - Use ACPI for slot detection\n"
|
|
" auto(default) - Auto select mode. Use acpi option if duplicate\n"
|
|
" slot ids are found. Otherwise, use pcie option\n");
|
|
|
|
int pciehp_acpi_slot_detection_check(struct pci_dev *dev)
|
|
{
|
|
if (slot_detection_mode != PCIEHP_DETECT_ACPI)
|
|
return 0;
|
|
if (acpi_pci_detect_ejectable(DEVICE_ACPI_HANDLE(&dev->dev)))
|
|
return 0;
|
|
return -ENODEV;
|
|
}
|
|
|
|
static int __init parse_detect_mode(void)
|
|
{
|
|
if (!pciehp_detect_mode)
|
|
return PCIEHP_DETECT_DEFAULT;
|
|
if (!strcmp(pciehp_detect_mode, "pcie"))
|
|
return PCIEHP_DETECT_PCIE;
|
|
if (!strcmp(pciehp_detect_mode, "acpi"))
|
|
return PCIEHP_DETECT_ACPI;
|
|
if (!strcmp(pciehp_detect_mode, "auto"))
|
|
return PCIEHP_DETECT_AUTO;
|
|
warn("bad specifier '%s' for pciehp_detect_mode. Use default\n",
|
|
pciehp_detect_mode);
|
|
return PCIEHP_DETECT_DEFAULT;
|
|
}
|
|
|
|
static int __initdata dup_slot_id;
|
|
static int __initdata acpi_slot_detected;
|
|
static struct list_head __initdata dummy_slots = LIST_HEAD_INIT(dummy_slots);
|
|
|
|
/* Dummy driver for dumplicate name detection */
|
|
static int __init dummy_probe(struct pcie_device *dev)
|
|
{
|
|
int pos;
|
|
u32 slot_cap;
|
|
acpi_handle handle;
|
|
struct dummy_slot *slot, *tmp;
|
|
struct pci_dev *pdev = dev->port;
|
|
/* Note: pciehp_detect_mode != PCIEHP_DETECT_ACPI here */
|
|
if (pciehp_get_hp_hw_control_from_firmware(pdev))
|
|
return -ENODEV;
|
|
pos = pci_pcie_cap(pdev);
|
|
if (!pos)
|
|
return -ENODEV;
|
|
pci_read_config_dword(pdev, pos + PCI_EXP_SLTCAP, &slot_cap);
|
|
slot = kzalloc(sizeof(*slot), GFP_KERNEL);
|
|
if (!slot)
|
|
return -ENOMEM;
|
|
slot->number = slot_cap >> 19;
|
|
list_for_each_entry(tmp, &dummy_slots, list) {
|
|
if (tmp->number == slot->number)
|
|
dup_slot_id++;
|
|
}
|
|
list_add_tail(&slot->list, &dummy_slots);
|
|
handle = DEVICE_ACPI_HANDLE(&pdev->dev);
|
|
if (!acpi_slot_detected && acpi_pci_detect_ejectable(handle))
|
|
acpi_slot_detected = 1;
|
|
return -ENODEV; /* dummy driver always returns error */
|
|
}
|
|
|
|
static struct pcie_port_service_driver __initdata dummy_driver = {
|
|
.name = "pciehp_dummy",
|
|
.port_type = PCIE_ANY_PORT,
|
|
.service = PCIE_PORT_SERVICE_HP,
|
|
.probe = dummy_probe,
|
|
};
|
|
|
|
static int __init select_detection_mode(void)
|
|
{
|
|
struct dummy_slot *slot, *tmp;
|
|
pcie_port_service_register(&dummy_driver);
|
|
pcie_port_service_unregister(&dummy_driver);
|
|
list_for_each_entry_safe(slot, tmp, &dummy_slots, list) {
|
|
list_del(&slot->list);
|
|
kfree(slot);
|
|
}
|
|
if (acpi_slot_detected && dup_slot_id)
|
|
return PCIEHP_DETECT_ACPI;
|
|
return PCIEHP_DETECT_PCIE;
|
|
}
|
|
|
|
void __init pciehp_acpi_slot_detection_init(void)
|
|
{
|
|
slot_detection_mode = parse_detect_mode();
|
|
if (slot_detection_mode != PCIEHP_DETECT_AUTO)
|
|
goto out;
|
|
slot_detection_mode = select_detection_mode();
|
|
out:
|
|
if (slot_detection_mode == PCIEHP_DETECT_ACPI)
|
|
info("Using ACPI for slot detection.\n");
|
|
}
|