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>
173 lines
3.7 KiB
C
173 lines
3.7 KiB
C
#include <linux/string.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/of.h>
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/mod_devicetable.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/of_platform.h>
|
|
|
|
#include "of_device_common.h"
|
|
|
|
static int node_match(struct device *dev, void *data)
|
|
{
|
|
struct of_device *op = to_of_device(dev);
|
|
struct device_node *dp = data;
|
|
|
|
return (op->node == dp);
|
|
}
|
|
|
|
struct of_device *of_find_device_by_node(struct device_node *dp)
|
|
{
|
|
struct device *dev = bus_find_device(&of_platform_bus_type, NULL,
|
|
dp, node_match);
|
|
|
|
if (dev)
|
|
return to_of_device(dev);
|
|
|
|
return NULL;
|
|
}
|
|
EXPORT_SYMBOL(of_find_device_by_node);
|
|
|
|
unsigned int irq_of_parse_and_map(struct device_node *node, int index)
|
|
{
|
|
struct of_device *op = of_find_device_by_node(node);
|
|
|
|
if (!op || index >= op->num_irqs)
|
|
return 0;
|
|
|
|
return op->irqs[index];
|
|
}
|
|
EXPORT_SYMBOL(irq_of_parse_and_map);
|
|
|
|
/* Take the archdata values for IOMMU, STC, and HOSTDATA found in
|
|
* BUS and propagate to all child of_device objects.
|
|
*/
|
|
void of_propagate_archdata(struct of_device *bus)
|
|
{
|
|
struct dev_archdata *bus_sd = &bus->dev.archdata;
|
|
struct device_node *bus_dp = bus->node;
|
|
struct device_node *dp;
|
|
|
|
for (dp = bus_dp->child; dp; dp = dp->sibling) {
|
|
struct of_device *op = of_find_device_by_node(dp);
|
|
|
|
op->dev.archdata.iommu = bus_sd->iommu;
|
|
op->dev.archdata.stc = bus_sd->stc;
|
|
op->dev.archdata.host_controller = bus_sd->host_controller;
|
|
op->dev.archdata.numa_node = bus_sd->numa_node;
|
|
|
|
if (dp->child)
|
|
of_propagate_archdata(op);
|
|
}
|
|
}
|
|
|
|
struct bus_type of_platform_bus_type;
|
|
EXPORT_SYMBOL(of_platform_bus_type);
|
|
|
|
static void get_cells(struct device_node *dp, int *addrc, int *sizec)
|
|
{
|
|
if (addrc)
|
|
*addrc = of_n_addr_cells(dp);
|
|
if (sizec)
|
|
*sizec = of_n_size_cells(dp);
|
|
}
|
|
|
|
/*
|
|
* Default translator (generic bus)
|
|
*/
|
|
|
|
void of_bus_default_count_cells(struct device_node *dev, int *addrc, int *sizec)
|
|
{
|
|
get_cells(dev, addrc, sizec);
|
|
}
|
|
|
|
/* Make sure the least significant 64-bits are in-range. Even
|
|
* for 3 or 4 cell values it is a good enough approximation.
|
|
*/
|
|
int of_out_of_range(const u32 *addr, const u32 *base,
|
|
const u32 *size, int na, int ns)
|
|
{
|
|
u64 a = of_read_addr(addr, na);
|
|
u64 b = of_read_addr(base, na);
|
|
|
|
if (a < b)
|
|
return 1;
|
|
|
|
b += of_read_addr(size, ns);
|
|
if (a >= b)
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int of_bus_default_map(u32 *addr, const u32 *range, int na, int ns, int pna)
|
|
{
|
|
u32 result[OF_MAX_ADDR_CELLS];
|
|
int i;
|
|
|
|
if (ns > 2) {
|
|
printk("of_device: Cannot handle size cells (%d) > 2.", ns);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (of_out_of_range(addr, range, range + na + pna, na, ns))
|
|
return -EINVAL;
|
|
|
|
/* Start with the parent range base. */
|
|
memcpy(result, range + na, pna * 4);
|
|
|
|
/* Add in the child address offset. */
|
|
for (i = 0; i < na; i++)
|
|
result[pna - 1 - i] +=
|
|
(addr[na - 1 - i] -
|
|
range[na - 1 - i]);
|
|
|
|
memcpy(addr, result, pna * 4);
|
|
|
|
return 0;
|
|
}
|
|
|
|
unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags)
|
|
{
|
|
if (flags)
|
|
return flags;
|
|
return IORESOURCE_MEM;
|
|
}
|
|
|
|
/*
|
|
* SBUS bus specific translator
|
|
*/
|
|
|
|
int of_bus_sbus_match(struct device_node *np)
|
|
{
|
|
struct device_node *dp = np;
|
|
|
|
while (dp) {
|
|
if (!strcmp(dp->name, "sbus") ||
|
|
!strcmp(dp->name, "sbi"))
|
|
return 1;
|
|
|
|
/* Have a look at use_1to1_mapping(). We're trying
|
|
* to match SBUS if that's the top-level bus and we
|
|
* don't have some intervening real bus that provides
|
|
* ranges based translations.
|
|
*/
|
|
if (of_find_property(dp, "ranges", NULL) != NULL)
|
|
break;
|
|
|
|
dp = dp->parent;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void of_bus_sbus_count_cells(struct device_node *child, int *addrc, int *sizec)
|
|
{
|
|
if (addrc)
|
|
*addrc = 2;
|
|
if (sizec)
|
|
*sizec = 1;
|
|
}
|