mirror of
https://github.com/torvalds/linux.git
synced 2024-12-15 07:33:56 +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>
257 lines
6.4 KiB
C
257 lines
6.4 KiB
C
/*
|
|
* linux/arch/arm/mach-pxa/cpufreq-pxa3xx.c
|
|
*
|
|
* Copyright (C) 2008 Marvell International Ltd.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/init.h>
|
|
#include <linux/cpufreq.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <mach/pxa3xx-regs.h>
|
|
|
|
#include "generic.h"
|
|
|
|
#define HSS_104M (0)
|
|
#define HSS_156M (1)
|
|
#define HSS_208M (2)
|
|
#define HSS_312M (3)
|
|
|
|
#define SMCFS_78M (0)
|
|
#define SMCFS_104M (2)
|
|
#define SMCFS_208M (5)
|
|
|
|
#define SFLFS_104M (0)
|
|
#define SFLFS_156M (1)
|
|
#define SFLFS_208M (2)
|
|
#define SFLFS_312M (3)
|
|
|
|
#define XSPCLK_156M (0)
|
|
#define XSPCLK_NONE (3)
|
|
|
|
#define DMCFS_26M (0)
|
|
#define DMCFS_260M (3)
|
|
|
|
struct pxa3xx_freq_info {
|
|
unsigned int cpufreq_mhz;
|
|
unsigned int core_xl : 5;
|
|
unsigned int core_xn : 3;
|
|
unsigned int hss : 2;
|
|
unsigned int dmcfs : 2;
|
|
unsigned int smcfs : 3;
|
|
unsigned int sflfs : 2;
|
|
unsigned int df_clkdiv : 3;
|
|
|
|
int vcc_core; /* in mV */
|
|
int vcc_sram; /* in mV */
|
|
};
|
|
|
|
#define OP(cpufreq, _xl, _xn, _hss, _dmc, _smc, _sfl, _dfi, vcore, vsram) \
|
|
{ \
|
|
.cpufreq_mhz = cpufreq, \
|
|
.core_xl = _xl, \
|
|
.core_xn = _xn, \
|
|
.hss = HSS_##_hss##M, \
|
|
.dmcfs = DMCFS_##_dmc##M, \
|
|
.smcfs = SMCFS_##_smc##M, \
|
|
.sflfs = SFLFS_##_sfl##M, \
|
|
.df_clkdiv = _dfi, \
|
|
.vcc_core = vcore, \
|
|
.vcc_sram = vsram, \
|
|
}
|
|
|
|
static struct pxa3xx_freq_info pxa300_freqs[] = {
|
|
/* CPU XL XN HSS DMEM SMEM SRAM DFI VCC_CORE VCC_SRAM */
|
|
OP(104, 8, 1, 104, 260, 78, 104, 3, 1000, 1100), /* 104MHz */
|
|
OP(208, 16, 1, 104, 260, 104, 156, 2, 1000, 1100), /* 208MHz */
|
|
OP(416, 16, 2, 156, 260, 104, 208, 2, 1100, 1200), /* 416MHz */
|
|
OP(624, 24, 2, 208, 260, 208, 312, 3, 1375, 1400), /* 624MHz */
|
|
};
|
|
|
|
static struct pxa3xx_freq_info pxa320_freqs[] = {
|
|
/* CPU XL XN HSS DMEM SMEM SRAM DFI VCC_CORE VCC_SRAM */
|
|
OP(104, 8, 1, 104, 260, 78, 104, 3, 1000, 1100), /* 104MHz */
|
|
OP(208, 16, 1, 104, 260, 104, 156, 2, 1000, 1100), /* 208MHz */
|
|
OP(416, 16, 2, 156, 260, 104, 208, 2, 1100, 1200), /* 416MHz */
|
|
OP(624, 24, 2, 208, 260, 208, 312, 3, 1375, 1400), /* 624MHz */
|
|
OP(806, 31, 2, 208, 260, 208, 312, 3, 1400, 1400), /* 806MHz */
|
|
};
|
|
|
|
static unsigned int pxa3xx_freqs_num;
|
|
static struct pxa3xx_freq_info *pxa3xx_freqs;
|
|
static struct cpufreq_frequency_table *pxa3xx_freqs_table;
|
|
|
|
static int setup_freqs_table(struct cpufreq_policy *policy,
|
|
struct pxa3xx_freq_info *freqs, int num)
|
|
{
|
|
struct cpufreq_frequency_table *table;
|
|
int i;
|
|
|
|
table = kzalloc((num + 1) * sizeof(*table), GFP_KERNEL);
|
|
if (table == NULL)
|
|
return -ENOMEM;
|
|
|
|
for (i = 0; i < num; i++) {
|
|
table[i].index = i;
|
|
table[i].frequency = freqs[i].cpufreq_mhz * 1000;
|
|
}
|
|
table[num].index = i;
|
|
table[num].frequency = CPUFREQ_TABLE_END;
|
|
|
|
pxa3xx_freqs = freqs;
|
|
pxa3xx_freqs_num = num;
|
|
pxa3xx_freqs_table = table;
|
|
|
|
return cpufreq_frequency_table_cpuinfo(policy, table);
|
|
}
|
|
|
|
static void __update_core_freq(struct pxa3xx_freq_info *info)
|
|
{
|
|
uint32_t mask = ACCR_XN_MASK | ACCR_XL_MASK;
|
|
uint32_t accr = ACCR;
|
|
uint32_t xclkcfg;
|
|
|
|
accr &= ~(ACCR_XN_MASK | ACCR_XL_MASK | ACCR_XSPCLK_MASK);
|
|
accr |= ACCR_XN(info->core_xn) | ACCR_XL(info->core_xl);
|
|
|
|
/* No clock until core PLL is re-locked */
|
|
accr |= ACCR_XSPCLK(XSPCLK_NONE);
|
|
|
|
xclkcfg = (info->core_xn == 2) ? 0x3 : 0x2; /* turbo bit */
|
|
|
|
ACCR = accr;
|
|
__asm__("mcr p14, 0, %0, c6, c0, 0\n" : : "r"(xclkcfg));
|
|
|
|
while ((ACSR & mask) != (accr & mask))
|
|
cpu_relax();
|
|
}
|
|
|
|
static void __update_bus_freq(struct pxa3xx_freq_info *info)
|
|
{
|
|
uint32_t mask;
|
|
uint32_t accr = ACCR;
|
|
|
|
mask = ACCR_SMCFS_MASK | ACCR_SFLFS_MASK | ACCR_HSS_MASK |
|
|
ACCR_DMCFS_MASK;
|
|
|
|
accr &= ~mask;
|
|
accr |= ACCR_SMCFS(info->smcfs) | ACCR_SFLFS(info->sflfs) |
|
|
ACCR_HSS(info->hss) | ACCR_DMCFS(info->dmcfs);
|
|
|
|
ACCR = accr;
|
|
|
|
while ((ACSR & mask) != (accr & mask))
|
|
cpu_relax();
|
|
}
|
|
|
|
static int pxa3xx_cpufreq_verify(struct cpufreq_policy *policy)
|
|
{
|
|
return cpufreq_frequency_table_verify(policy, pxa3xx_freqs_table);
|
|
}
|
|
|
|
static unsigned int pxa3xx_cpufreq_get(unsigned int cpu)
|
|
{
|
|
return get_clk_frequency_khz(0);
|
|
}
|
|
|
|
static int pxa3xx_cpufreq_set(struct cpufreq_policy *policy,
|
|
unsigned int target_freq,
|
|
unsigned int relation)
|
|
{
|
|
struct pxa3xx_freq_info *next;
|
|
struct cpufreq_freqs freqs;
|
|
unsigned long flags;
|
|
int idx;
|
|
|
|
if (policy->cpu != 0)
|
|
return -EINVAL;
|
|
|
|
/* Lookup the next frequency */
|
|
if (cpufreq_frequency_table_target(policy, pxa3xx_freqs_table,
|
|
target_freq, relation, &idx))
|
|
return -EINVAL;
|
|
|
|
next = &pxa3xx_freqs[idx];
|
|
|
|
freqs.old = policy->cur;
|
|
freqs.new = next->cpufreq_mhz * 1000;
|
|
freqs.cpu = policy->cpu;
|
|
|
|
pr_debug("CPU frequency from %d MHz to %d MHz%s\n",
|
|
freqs.old / 1000, freqs.new / 1000,
|
|
(freqs.old == freqs.new) ? " (skipped)" : "");
|
|
|
|
if (freqs.old == target_freq)
|
|
return 0;
|
|
|
|
cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
|
|
|
|
local_irq_save(flags);
|
|
__update_core_freq(next);
|
|
__update_bus_freq(next);
|
|
local_irq_restore(flags);
|
|
|
|
cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static __init int pxa3xx_cpufreq_init(struct cpufreq_policy *policy)
|
|
{
|
|
int ret = -EINVAL;
|
|
|
|
/* set default policy and cpuinfo */
|
|
policy->cpuinfo.min_freq = 104000;
|
|
policy->cpuinfo.max_freq = (cpu_is_pxa320()) ? 806000 : 624000;
|
|
policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */
|
|
policy->cur = policy->min = policy->max = get_clk_frequency_khz(0);
|
|
|
|
if (cpu_is_pxa300() || cpu_is_pxa310())
|
|
ret = setup_freqs_table(policy, ARRAY_AND_SIZE(pxa300_freqs));
|
|
|
|
if (cpu_is_pxa320())
|
|
ret = setup_freqs_table(policy, ARRAY_AND_SIZE(pxa320_freqs));
|
|
|
|
if (ret) {
|
|
pr_err("failed to setup frequency table\n");
|
|
return ret;
|
|
}
|
|
|
|
pr_info("CPUFREQ support for PXA3xx initialized\n");
|
|
return 0;
|
|
}
|
|
|
|
static struct cpufreq_driver pxa3xx_cpufreq_driver = {
|
|
.verify = pxa3xx_cpufreq_verify,
|
|
.target = pxa3xx_cpufreq_set,
|
|
.init = pxa3xx_cpufreq_init,
|
|
.get = pxa3xx_cpufreq_get,
|
|
.name = "pxa3xx-cpufreq",
|
|
};
|
|
|
|
static int __init cpufreq_init(void)
|
|
{
|
|
if (cpu_is_pxa3xx())
|
|
return cpufreq_register_driver(&pxa3xx_cpufreq_driver);
|
|
|
|
return 0;
|
|
}
|
|
module_init(cpufreq_init);
|
|
|
|
static void __exit cpufreq_exit(void)
|
|
{
|
|
cpufreq_unregister_driver(&pxa3xx_cpufreq_driver);
|
|
}
|
|
module_exit(cpufreq_exit);
|
|
|
|
MODULE_DESCRIPTION("CPU frequency scaling driver for PXA3xx");
|
|
MODULE_LICENSE("GPL");
|