mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 10:01:43 +00:00
5a0e3ad6af
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>
331 lines
8.6 KiB
C
331 lines
8.6 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 1997, 1998 Ralf Baechle
|
|
* Copyright (C) 1999 SuSE GmbH
|
|
* Copyright (C) 1999-2001 Hewlett-Packard Company
|
|
* Copyright (C) 1999-2001 Grant Grundler
|
|
*/
|
|
#include <linux/eisa.h>
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/types.h>
|
|
|
|
#include <asm/io.h>
|
|
#include <asm/system.h>
|
|
#include <asm/superio.h>
|
|
|
|
#define DEBUG_RESOURCES 0
|
|
#define DEBUG_CONFIG 0
|
|
|
|
#if DEBUG_CONFIG
|
|
# define DBGC(x...) printk(KERN_DEBUG x)
|
|
#else
|
|
# define DBGC(x...)
|
|
#endif
|
|
|
|
|
|
#if DEBUG_RESOURCES
|
|
#define DBG_RES(x...) printk(KERN_DEBUG x)
|
|
#else
|
|
#define DBG_RES(x...)
|
|
#endif
|
|
|
|
/* To be used as: mdelay(pci_post_reset_delay);
|
|
*
|
|
* post_reset is the time the kernel should stall to prevent anyone from
|
|
* accessing the PCI bus once #RESET is de-asserted.
|
|
* PCI spec somewhere says 1 second but with multi-PCI bus systems,
|
|
* this makes the boot time much longer than necessary.
|
|
* 20ms seems to work for all the HP PCI implementations to date.
|
|
*
|
|
* #define pci_post_reset_delay 50
|
|
*/
|
|
|
|
struct pci_port_ops *pci_port __read_mostly;
|
|
struct pci_bios_ops *pci_bios __read_mostly;
|
|
|
|
static int pci_hba_count __read_mostly;
|
|
|
|
/* parisc_pci_hba used by pci_port->in/out() ops to lookup bus data. */
|
|
#define PCI_HBA_MAX 32
|
|
static struct pci_hba_data *parisc_pci_hba[PCI_HBA_MAX] __read_mostly;
|
|
|
|
|
|
/********************************************************************
|
|
**
|
|
** I/O port space support
|
|
**
|
|
*********************************************************************/
|
|
|
|
/* EISA port numbers and PCI port numbers share the same interface. Some
|
|
* machines have both EISA and PCI adapters installed. Rather than turn
|
|
* pci_port into an array, we reserve bus 0 for EISA and call the EISA
|
|
* routines if the access is to a port on bus 0. We don't want to fix
|
|
* EISA and ISA drivers which assume port space is <= 0xffff.
|
|
*/
|
|
|
|
#ifdef CONFIG_EISA
|
|
#define EISA_IN(size) if (EISA_bus && (b == 0)) return eisa_in##size(addr)
|
|
#define EISA_OUT(size) if (EISA_bus && (b == 0)) return eisa_out##size(d, addr)
|
|
#else
|
|
#define EISA_IN(size)
|
|
#define EISA_OUT(size)
|
|
#endif
|
|
|
|
#define PCI_PORT_IN(type, size) \
|
|
u##size in##type (int addr) \
|
|
{ \
|
|
int b = PCI_PORT_HBA(addr); \
|
|
EISA_IN(size); \
|
|
if (!parisc_pci_hba[b]) return (u##size) -1; \
|
|
return pci_port->in##type(parisc_pci_hba[b], PCI_PORT_ADDR(addr)); \
|
|
} \
|
|
EXPORT_SYMBOL(in##type);
|
|
|
|
PCI_PORT_IN(b, 8)
|
|
PCI_PORT_IN(w, 16)
|
|
PCI_PORT_IN(l, 32)
|
|
|
|
|
|
#define PCI_PORT_OUT(type, size) \
|
|
void out##type (u##size d, int addr) \
|
|
{ \
|
|
int b = PCI_PORT_HBA(addr); \
|
|
EISA_OUT(size); \
|
|
if (!parisc_pci_hba[b]) return; \
|
|
pci_port->out##type(parisc_pci_hba[b], PCI_PORT_ADDR(addr), d); \
|
|
} \
|
|
EXPORT_SYMBOL(out##type);
|
|
|
|
PCI_PORT_OUT(b, 8)
|
|
PCI_PORT_OUT(w, 16)
|
|
PCI_PORT_OUT(l, 32)
|
|
|
|
|
|
|
|
/*
|
|
* BIOS32 replacement.
|
|
*/
|
|
static int __init pcibios_init(void)
|
|
{
|
|
if (!pci_bios)
|
|
return -1;
|
|
|
|
if (pci_bios->init) {
|
|
pci_bios->init();
|
|
} else {
|
|
printk(KERN_WARNING "pci_bios != NULL but init() is!\n");
|
|
}
|
|
|
|
/* Set the CLS for PCI as early as possible. */
|
|
pci_cache_line_size = pci_dfl_cache_line_size;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Called from pci_do_scan_bus() *after* walking a bus but before walking PPBs. */
|
|
void pcibios_fixup_bus(struct pci_bus *bus)
|
|
{
|
|
if (pci_bios->fixup_bus) {
|
|
pci_bios->fixup_bus(bus);
|
|
} else {
|
|
printk(KERN_WARNING "pci_bios != NULL but fixup_bus() is!\n");
|
|
}
|
|
}
|
|
|
|
|
|
char *pcibios_setup(char *str)
|
|
{
|
|
return str;
|
|
}
|
|
|
|
/*
|
|
* Called by pci_set_master() - a driver interface.
|
|
*
|
|
* Legacy PDC guarantees to set:
|
|
* Map Memory BAR's into PA IO space.
|
|
* Map Expansion ROM BAR into one common PA IO space per bus.
|
|
* Map IO BAR's into PCI IO space.
|
|
* Command (see below)
|
|
* Cache Line Size
|
|
* Latency Timer
|
|
* Interrupt Line
|
|
* PPB: secondary latency timer, io/mmio base/limit,
|
|
* bus numbers, bridge control
|
|
*
|
|
*/
|
|
void pcibios_set_master(struct pci_dev *dev)
|
|
{
|
|
u8 lat;
|
|
|
|
/* If someone already mucked with this, don't touch it. */
|
|
pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat);
|
|
if (lat >= 16) return;
|
|
|
|
/*
|
|
** HP generally has fewer devices on the bus than other architectures.
|
|
** upper byte is PCI_LATENCY_TIMER.
|
|
*/
|
|
pci_write_config_word(dev, PCI_CACHE_LINE_SIZE,
|
|
(0x80 << 8) | pci_cache_line_size);
|
|
}
|
|
|
|
|
|
void __init pcibios_init_bus(struct pci_bus *bus)
|
|
{
|
|
struct pci_dev *dev = bus->self;
|
|
unsigned short bridge_ctl;
|
|
|
|
/* We deal only with pci controllers and pci-pci bridges. */
|
|
if (!dev || (dev->class >> 8) != PCI_CLASS_BRIDGE_PCI)
|
|
return;
|
|
|
|
/* PCI-PCI bridge - set the cache line and default latency
|
|
(32) for primary and secondary buses. */
|
|
pci_write_config_byte(dev, PCI_SEC_LATENCY_TIMER, 32);
|
|
|
|
pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &bridge_ctl);
|
|
bridge_ctl |= PCI_BRIDGE_CTL_PARITY | PCI_BRIDGE_CTL_SERR;
|
|
pci_write_config_word(dev, PCI_BRIDGE_CONTROL, bridge_ctl);
|
|
}
|
|
|
|
/* called by drivers/pci/setup-bus.c:pci_setup_bridge(). */
|
|
void __devinit pcibios_resource_to_bus(struct pci_dev *dev,
|
|
struct pci_bus_region *region, struct resource *res)
|
|
{
|
|
#ifdef CONFIG_64BIT
|
|
struct pci_hba_data *hba = HBA_DATA(dev->bus->bridge->platform_data);
|
|
#endif
|
|
|
|
if (res->flags & IORESOURCE_IO) {
|
|
/*
|
|
** I/O space may see busnumbers here. Something
|
|
** in the form of 0xbbxxxx where bb is the bus num
|
|
** and xxxx is the I/O port space address.
|
|
** Remaining address translation are done in the
|
|
** PCI Host adapter specific code - ie dino_out8.
|
|
*/
|
|
region->start = PCI_PORT_ADDR(res->start);
|
|
region->end = PCI_PORT_ADDR(res->end);
|
|
} else if (res->flags & IORESOURCE_MEM) {
|
|
/* Convert MMIO addr to PCI addr (undo global virtualization) */
|
|
region->start = PCI_BUS_ADDR(hba, res->start);
|
|
region->end = PCI_BUS_ADDR(hba, res->end);
|
|
}
|
|
|
|
DBG_RES("pcibios_resource_to_bus(%02x %s [%lx,%lx])\n",
|
|
dev->bus->number, res->flags & IORESOURCE_IO ? "IO" : "MEM",
|
|
region->start, region->end);
|
|
}
|
|
|
|
void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
|
|
struct pci_bus_region *region)
|
|
{
|
|
#ifdef CONFIG_64BIT
|
|
struct pci_hba_data *hba = HBA_DATA(dev->bus->bridge->platform_data);
|
|
#endif
|
|
|
|
if (res->flags & IORESOURCE_MEM) {
|
|
res->start = PCI_HOST_ADDR(hba, region->start);
|
|
res->end = PCI_HOST_ADDR(hba, region->end);
|
|
}
|
|
|
|
if (res->flags & IORESOURCE_IO) {
|
|
res->start = region->start;
|
|
res->end = region->end;
|
|
}
|
|
}
|
|
|
|
#ifdef CONFIG_HOTPLUG
|
|
EXPORT_SYMBOL(pcibios_resource_to_bus);
|
|
EXPORT_SYMBOL(pcibios_bus_to_resource);
|
|
#endif
|
|
|
|
/*
|
|
* pcibios align resources() is called every time generic PCI code
|
|
* wants to generate a new address. The process of looking for
|
|
* an available address, each candidate is first "aligned" and
|
|
* then checked if the resource is available until a match is found.
|
|
*
|
|
* Since we are just checking candidates, don't use any fields other
|
|
* than res->start.
|
|
*/
|
|
resource_size_t pcibios_align_resource(void *data, const struct resource *res,
|
|
resource_size_t size, resource_size_t alignment)
|
|
{
|
|
resource_size_t mask, align, start = res->start;
|
|
|
|
DBG_RES("pcibios_align_resource(%s, (%p) [%lx,%lx]/%x, 0x%lx, 0x%lx)\n",
|
|
pci_name(((struct pci_dev *) data)),
|
|
res->parent, res->start, res->end,
|
|
(int) res->flags, size, alignment);
|
|
|
|
/* If it's not IO, then it's gotta be MEM */
|
|
align = (res->flags & IORESOURCE_IO) ? PCIBIOS_MIN_IO : PCIBIOS_MIN_MEM;
|
|
|
|
/* Align to largest of MIN or input size */
|
|
mask = max(alignment, align) - 1;
|
|
start += mask;
|
|
start &= ~mask;
|
|
|
|
return start;
|
|
}
|
|
|
|
|
|
/*
|
|
* A driver is enabling the device. We make sure that all the appropriate
|
|
* bits are set to allow the device to operate as the driver is expecting.
|
|
* We enable the port IO and memory IO bits if the device has any BARs of
|
|
* that type, and we enable the PERR and SERR bits unconditionally.
|
|
* Drivers that do not need parity (eg graphics and possibly networking)
|
|
* can clear these bits if they want.
|
|
*/
|
|
int pcibios_enable_device(struct pci_dev *dev, int mask)
|
|
{
|
|
int err;
|
|
u16 cmd, old_cmd;
|
|
|
|
err = pci_enable_resources(dev, mask);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
|
old_cmd = cmd;
|
|
|
|
cmd |= (PCI_COMMAND_SERR | PCI_COMMAND_PARITY);
|
|
|
|
#if 0
|
|
/* If bridge/bus controller has FBB enabled, child must too. */
|
|
if (dev->bus->bridge_ctl & PCI_BRIDGE_CTL_FAST_BACK)
|
|
cmd |= PCI_COMMAND_FAST_BACK;
|
|
#endif
|
|
|
|
if (cmd != old_cmd) {
|
|
dev_info(&dev->dev, "enabling SERR and PARITY (%04x -> %04x)\n",
|
|
old_cmd, cmd);
|
|
pci_write_config_word(dev, PCI_COMMAND, cmd);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* PA-RISC specific */
|
|
void pcibios_register_hba(struct pci_hba_data *hba)
|
|
{
|
|
if (pci_hba_count >= PCI_HBA_MAX) {
|
|
printk(KERN_ERR "PCI: Too many Host Bus Adapters\n");
|
|
return;
|
|
}
|
|
|
|
parisc_pci_hba[pci_hba_count] = hba;
|
|
hba->hba_num = pci_hba_count++;
|
|
}
|
|
|
|
subsys_initcall(pcibios_init);
|