2005-04-16 18:20:36 -04:00
|
|
|
#include <linux/sysdev.h>
|
|
|
|
#include <linux/cpu.h>
|
|
|
|
#include <linux/smp.h>
|
|
|
|
#include <linux/percpu.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/nodemask.h>
|
|
|
|
#include <linux/cpumask.h>
|
|
|
|
#include <linux/notifier.h>
|
|
|
|
|
|
|
|
#include <asm/current.h>
|
|
|
|
#include <asm/processor.h>
|
|
|
|
#include <asm/cputable.h>
|
2005-08-03 00:35:25 -04:00
|
|
|
#include <asm/firmware.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
#include <asm/hvcall.h>
|
|
|
|
#include <asm/prom.h>
|
|
|
|
#include <asm/paca.h>
|
|
|
|
#include <asm/lppaca.h>
|
|
|
|
#include <asm/machdep.h>
|
2005-11-06 21:18:13 -05:00
|
|
|
#include <asm/smp.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
static DEFINE_PER_CPU(struct cpu, cpu_devices);
|
|
|
|
|
|
|
|
/* SMT stuff */
|
|
|
|
|
|
|
|
#ifdef CONFIG_PPC_MULTIPLATFORM
|
2006-09-22 06:30:14 -04:00
|
|
|
/* Time in microseconds we delay before sleeping in the idle loop */
|
|
|
|
DEFINE_PER_CPU(unsigned long, smt_snooze_delay) = { 100 };
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
static ssize_t store_smt_snooze_delay(struct sys_device *dev, const char *buf,
|
|
|
|
size_t count)
|
|
|
|
{
|
|
|
|
struct cpu *cpu = container_of(dev, struct cpu, sysdev);
|
|
|
|
ssize_t ret;
|
|
|
|
unsigned long snooze;
|
|
|
|
|
|
|
|
ret = sscanf(buf, "%lu", &snooze);
|
|
|
|
if (ret != 1)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
per_cpu(smt_snooze_delay, cpu->sysdev.id) = snooze;
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t show_smt_snooze_delay(struct sys_device *dev, char *buf)
|
|
|
|
{
|
|
|
|
struct cpu *cpu = container_of(dev, struct cpu, sysdev);
|
|
|
|
|
|
|
|
return sprintf(buf, "%lu\n", per_cpu(smt_snooze_delay, cpu->sysdev.id));
|
|
|
|
}
|
|
|
|
|
|
|
|
static SYSDEV_ATTR(smt_snooze_delay, 0644, show_smt_snooze_delay,
|
|
|
|
store_smt_snooze_delay);
|
|
|
|
|
|
|
|
/* Only parse OF options if the matching cmdline option was not specified */
|
|
|
|
static int smt_snooze_cmdline;
|
|
|
|
|
|
|
|
static int __init smt_setup(void)
|
|
|
|
{
|
|
|
|
struct device_node *options;
|
2006-07-12 01:35:54 -04:00
|
|
|
const unsigned int *val;
|
2005-04-16 18:20:36 -04:00
|
|
|
unsigned int cpu;
|
|
|
|
|
|
|
|
if (!cpu_has_feature(CPU_FTR_SMT))
|
2006-03-27 22:08:39 -05:00
|
|
|
return -ENODEV;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2007-04-23 23:50:55 -04:00
|
|
|
options = of_find_node_by_path("/options");
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!options)
|
2006-03-27 22:08:39 -05:00
|
|
|
return -ENODEV;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2007-04-03 08:26:41 -04:00
|
|
|
val = of_get_property(options, "ibm,smt-snooze-delay", NULL);
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!smt_snooze_cmdline && val) {
|
2006-03-28 17:50:51 -05:00
|
|
|
for_each_possible_cpu(cpu)
|
2005-04-16 18:20:36 -04:00
|
|
|
per_cpu(smt_snooze_delay, cpu) = *val;
|
|
|
|
}
|
|
|
|
|
2007-04-23 23:50:55 -04:00
|
|
|
of_node_put(options);
|
2006-03-27 22:08:39 -05:00
|
|
|
return 0;
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
__initcall(smt_setup);
|
|
|
|
|
|
|
|
static int __init setup_smt_snooze_delay(char *str)
|
|
|
|
{
|
|
|
|
unsigned int cpu;
|
|
|
|
int snooze;
|
|
|
|
|
|
|
|
if (!cpu_has_feature(CPU_FTR_SMT))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
smt_snooze_cmdline = 1;
|
|
|
|
|
|
|
|
if (get_option(&str, &snooze)) {
|
2006-03-28 17:50:51 -05:00
|
|
|
for_each_possible_cpu(cpu)
|
2005-04-16 18:20:36 -04:00
|
|
|
per_cpu(smt_snooze_delay, cpu) = snooze;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
__setup("smt-snooze-delay=", setup_smt_snooze_delay);
|
|
|
|
|
2005-08-08 21:13:36 -04:00
|
|
|
#endif /* CONFIG_PPC_MULTIPLATFORM */
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
/*
|
|
|
|
* Enabling PMCs will slow partition context switch times so we only do
|
|
|
|
* it the first time we write to the PMCs.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static DEFINE_PER_CPU(char, pmcs_enabled);
|
|
|
|
|
|
|
|
void ppc64_enable_pmcs(void)
|
|
|
|
{
|
|
|
|
/* Only need to enable them once */
|
|
|
|
if (__get_cpu_var(pmcs_enabled))
|
|
|
|
return;
|
|
|
|
|
|
|
|
__get_cpu_var(pmcs_enabled) = 1;
|
|
|
|
|
2005-08-08 21:13:36 -04:00
|
|
|
if (ppc_md.enable_pmcs)
|
|
|
|
ppc_md.enable_pmcs();
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(ppc64_enable_pmcs);
|
|
|
|
|
|
|
|
/* XXX convert to rusty's on_one_cpu */
|
|
|
|
static unsigned long run_on_cpu(unsigned long cpu,
|
|
|
|
unsigned long (*func)(unsigned long),
|
|
|
|
unsigned long arg)
|
|
|
|
{
|
|
|
|
cpumask_t old_affinity = current->cpus_allowed;
|
|
|
|
unsigned long ret;
|
|
|
|
|
|
|
|
/* should return -EINVAL to userspace */
|
|
|
|
if (set_cpus_allowed(current, cpumask_of_cpu(cpu)))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ret = func(arg);
|
|
|
|
|
|
|
|
set_cpus_allowed(current, old_affinity);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define SYSFS_PMCSETUP(NAME, ADDRESS) \
|
|
|
|
static unsigned long read_##NAME(unsigned long junk) \
|
|
|
|
{ \
|
|
|
|
return mfspr(ADDRESS); \
|
|
|
|
} \
|
|
|
|
static unsigned long write_##NAME(unsigned long val) \
|
|
|
|
{ \
|
|
|
|
ppc64_enable_pmcs(); \
|
|
|
|
mtspr(ADDRESS, val); \
|
|
|
|
return 0; \
|
|
|
|
} \
|
|
|
|
static ssize_t show_##NAME(struct sys_device *dev, char *buf) \
|
|
|
|
{ \
|
|
|
|
struct cpu *cpu = container_of(dev, struct cpu, sysdev); \
|
|
|
|
unsigned long val = run_on_cpu(cpu->sysdev.id, read_##NAME, 0); \
|
|
|
|
return sprintf(buf, "%lx\n", val); \
|
|
|
|
} \
|
|
|
|
static ssize_t __attribute_used__ \
|
|
|
|
store_##NAME(struct sys_device *dev, const char *buf, size_t count) \
|
|
|
|
{ \
|
|
|
|
struct cpu *cpu = container_of(dev, struct cpu, sysdev); \
|
|
|
|
unsigned long val; \
|
|
|
|
int ret = sscanf(buf, "%lx", &val); \
|
|
|
|
if (ret != 1) \
|
|
|
|
return -EINVAL; \
|
|
|
|
run_on_cpu(cpu->sysdev.id, write_##NAME, val); \
|
|
|
|
return count; \
|
|
|
|
}
|
|
|
|
|
2007-01-28 22:25:57 -05:00
|
|
|
|
|
|
|
/* Let's define all possible registers, we'll only hook up the ones
|
|
|
|
* that are implemented on the current processor
|
|
|
|
*/
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
SYSFS_PMCSETUP(mmcr0, SPRN_MMCR0);
|
|
|
|
SYSFS_PMCSETUP(mmcr1, SPRN_MMCR1);
|
|
|
|
SYSFS_PMCSETUP(mmcra, SPRN_MMCRA);
|
|
|
|
SYSFS_PMCSETUP(pmc1, SPRN_PMC1);
|
|
|
|
SYSFS_PMCSETUP(pmc2, SPRN_PMC2);
|
|
|
|
SYSFS_PMCSETUP(pmc3, SPRN_PMC3);
|
|
|
|
SYSFS_PMCSETUP(pmc4, SPRN_PMC4);
|
|
|
|
SYSFS_PMCSETUP(pmc5, SPRN_PMC5);
|
|
|
|
SYSFS_PMCSETUP(pmc6, SPRN_PMC6);
|
|
|
|
SYSFS_PMCSETUP(pmc7, SPRN_PMC7);
|
|
|
|
SYSFS_PMCSETUP(pmc8, SPRN_PMC8);
|
|
|
|
SYSFS_PMCSETUP(purr, SPRN_PURR);
|
2006-12-08 01:51:13 -05:00
|
|
|
SYSFS_PMCSETUP(spurr, SPRN_SPURR);
|
2006-12-08 01:46:58 -05:00
|
|
|
SYSFS_PMCSETUP(dscr, SPRN_DSCR);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2007-04-18 02:38:21 -04:00
|
|
|
SYSFS_PMCSETUP(pa6t_pmc0, SPRN_PA6T_PMC0);
|
|
|
|
SYSFS_PMCSETUP(pa6t_pmc1, SPRN_PA6T_PMC1);
|
|
|
|
SYSFS_PMCSETUP(pa6t_pmc2, SPRN_PA6T_PMC2);
|
|
|
|
SYSFS_PMCSETUP(pa6t_pmc3, SPRN_PA6T_PMC3);
|
|
|
|
SYSFS_PMCSETUP(pa6t_pmc4, SPRN_PA6T_PMC4);
|
|
|
|
SYSFS_PMCSETUP(pa6t_pmc5, SPRN_PA6T_PMC5);
|
2007-01-28 22:25:57 -05:00
|
|
|
|
2007-09-04 22:09:06 -04:00
|
|
|
#ifdef CONFIG_DEBUG_KERNEL
|
|
|
|
SYSFS_PMCSETUP(hid0, SPRN_HID0);
|
|
|
|
SYSFS_PMCSETUP(hid1, SPRN_HID1);
|
|
|
|
SYSFS_PMCSETUP(hid4, SPRN_HID4);
|
|
|
|
SYSFS_PMCSETUP(hid5, SPRN_HID5);
|
|
|
|
SYSFS_PMCSETUP(ima0, SPRN_PA6T_IMA0);
|
|
|
|
SYSFS_PMCSETUP(ima1, SPRN_PA6T_IMA1);
|
|
|
|
SYSFS_PMCSETUP(ima2, SPRN_PA6T_IMA2);
|
|
|
|
SYSFS_PMCSETUP(ima3, SPRN_PA6T_IMA3);
|
|
|
|
SYSFS_PMCSETUP(ima4, SPRN_PA6T_IMA4);
|
|
|
|
SYSFS_PMCSETUP(ima5, SPRN_PA6T_IMA5);
|
|
|
|
SYSFS_PMCSETUP(ima6, SPRN_PA6T_IMA6);
|
|
|
|
SYSFS_PMCSETUP(ima7, SPRN_PA6T_IMA7);
|
|
|
|
SYSFS_PMCSETUP(ima8, SPRN_PA6T_IMA8);
|
|
|
|
SYSFS_PMCSETUP(ima9, SPRN_PA6T_IMA9);
|
|
|
|
SYSFS_PMCSETUP(imaat, SPRN_PA6T_IMAAT);
|
|
|
|
SYSFS_PMCSETUP(btcr, SPRN_PA6T_BTCR);
|
|
|
|
SYSFS_PMCSETUP(pccr, SPRN_PA6T_PCCR);
|
|
|
|
SYSFS_PMCSETUP(rpccr, SPRN_PA6T_RPCCR);
|
|
|
|
SYSFS_PMCSETUP(der, SPRN_PA6T_DER);
|
|
|
|
SYSFS_PMCSETUP(mer, SPRN_PA6T_MER);
|
|
|
|
SYSFS_PMCSETUP(ber, SPRN_PA6T_BER);
|
|
|
|
SYSFS_PMCSETUP(ier, SPRN_PA6T_IER);
|
|
|
|
SYSFS_PMCSETUP(sier, SPRN_PA6T_SIER);
|
|
|
|
SYSFS_PMCSETUP(siar, SPRN_PA6T_SIAR);
|
|
|
|
SYSFS_PMCSETUP(tsr0, SPRN_PA6T_TSR0);
|
|
|
|
SYSFS_PMCSETUP(tsr1, SPRN_PA6T_TSR1);
|
|
|
|
SYSFS_PMCSETUP(tsr2, SPRN_PA6T_TSR2);
|
|
|
|
SYSFS_PMCSETUP(tsr3, SPRN_PA6T_TSR3);
|
|
|
|
#endif /* CONFIG_DEBUG_KERNEL */
|
2007-01-28 22:25:57 -05:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
static SYSDEV_ATTR(mmcra, 0600, show_mmcra, store_mmcra);
|
2006-12-08 01:51:13 -05:00
|
|
|
static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL);
|
2006-12-08 01:46:58 -05:00
|
|
|
static SYSDEV_ATTR(dscr, 0600, show_dscr, store_dscr);
|
2007-01-28 22:25:57 -05:00
|
|
|
static SYSDEV_ATTR(purr, 0600, show_purr, store_purr);
|
|
|
|
|
|
|
|
static struct sysdev_attribute ibm_common_attrs[] = {
|
|
|
|
_SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
|
|
|
|
_SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct sysdev_attribute ibm_pmc_attrs[] = {
|
|
|
|
_SYSDEV_ATTR(pmc1, 0600, show_pmc1, store_pmc1),
|
|
|
|
_SYSDEV_ATTR(pmc2, 0600, show_pmc2, store_pmc2),
|
|
|
|
_SYSDEV_ATTR(pmc3, 0600, show_pmc3, store_pmc3),
|
|
|
|
_SYSDEV_ATTR(pmc4, 0600, show_pmc4, store_pmc4),
|
|
|
|
_SYSDEV_ATTR(pmc5, 0600, show_pmc5, store_pmc5),
|
|
|
|
_SYSDEV_ATTR(pmc6, 0600, show_pmc6, store_pmc6),
|
|
|
|
_SYSDEV_ATTR(pmc7, 0600, show_pmc7, store_pmc7),
|
|
|
|
_SYSDEV_ATTR(pmc8, 0600, show_pmc8, store_pmc8),
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct sysdev_attribute pa6t_attrs[] = {
|
|
|
|
_SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
|
|
|
|
_SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
|
|
|
|
_SYSDEV_ATTR(pmc0, 0600, show_pa6t_pmc0, store_pa6t_pmc0),
|
|
|
|
_SYSDEV_ATTR(pmc1, 0600, show_pa6t_pmc1, store_pa6t_pmc1),
|
|
|
|
_SYSDEV_ATTR(pmc2, 0600, show_pa6t_pmc2, store_pa6t_pmc2),
|
|
|
|
_SYSDEV_ATTR(pmc3, 0600, show_pa6t_pmc3, store_pa6t_pmc3),
|
|
|
|
_SYSDEV_ATTR(pmc4, 0600, show_pa6t_pmc4, store_pa6t_pmc4),
|
|
|
|
_SYSDEV_ATTR(pmc5, 0600, show_pa6t_pmc5, store_pa6t_pmc5),
|
2007-09-04 22:09:06 -04:00
|
|
|
#ifdef CONFIG_DEBUG_KERNEL
|
|
|
|
_SYSDEV_ATTR(hid0, 0600, show_hid0, store_hid0),
|
|
|
|
_SYSDEV_ATTR(hid1, 0600, show_hid1, store_hid1),
|
|
|
|
_SYSDEV_ATTR(hid4, 0600, show_hid4, store_hid4),
|
|
|
|
_SYSDEV_ATTR(hid5, 0600, show_hid5, store_hid5),
|
|
|
|
_SYSDEV_ATTR(ima0, 0600, show_ima0, store_ima0),
|
|
|
|
_SYSDEV_ATTR(ima1, 0600, show_ima1, store_ima1),
|
|
|
|
_SYSDEV_ATTR(ima2, 0600, show_ima2, store_ima2),
|
|
|
|
_SYSDEV_ATTR(ima3, 0600, show_ima3, store_ima3),
|
|
|
|
_SYSDEV_ATTR(ima4, 0600, show_ima4, store_ima4),
|
|
|
|
_SYSDEV_ATTR(ima5, 0600, show_ima5, store_ima5),
|
|
|
|
_SYSDEV_ATTR(ima6, 0600, show_ima6, store_ima6),
|
|
|
|
_SYSDEV_ATTR(ima7, 0600, show_ima7, store_ima7),
|
|
|
|
_SYSDEV_ATTR(ima8, 0600, show_ima8, store_ima8),
|
|
|
|
_SYSDEV_ATTR(ima9, 0600, show_ima9, store_ima9),
|
|
|
|
_SYSDEV_ATTR(imaat, 0600, show_imaat, store_imaat),
|
|
|
|
_SYSDEV_ATTR(btcr, 0600, show_btcr, store_btcr),
|
|
|
|
_SYSDEV_ATTR(pccr, 0600, show_pccr, store_pccr),
|
|
|
|
_SYSDEV_ATTR(rpccr, 0600, show_rpccr, store_rpccr),
|
|
|
|
_SYSDEV_ATTR(der, 0600, show_der, store_der),
|
|
|
|
_SYSDEV_ATTR(mer, 0600, show_mer, store_mer),
|
|
|
|
_SYSDEV_ATTR(ber, 0600, show_ber, store_ber),
|
|
|
|
_SYSDEV_ATTR(ier, 0600, show_ier, store_ier),
|
|
|
|
_SYSDEV_ATTR(sier, 0600, show_sier, store_sier),
|
|
|
|
_SYSDEV_ATTR(siar, 0600, show_siar, store_siar),
|
|
|
|
_SYSDEV_ATTR(tsr0, 0600, show_tsr0, store_tsr0),
|
|
|
|
_SYSDEV_ATTR(tsr1, 0600, show_tsr1, store_tsr1),
|
|
|
|
_SYSDEV_ATTR(tsr2, 0600, show_tsr2, store_tsr2),
|
|
|
|
_SYSDEV_ATTR(tsr3, 0600, show_tsr3, store_tsr3),
|
|
|
|
#endif /* CONFIG_DEBUG_KERNEL */
|
2007-01-28 22:25:57 -05:00
|
|
|
};
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
static void register_cpu_online(unsigned int cpu)
|
|
|
|
{
|
|
|
|
struct cpu *c = &per_cpu(cpu_devices, cpu);
|
|
|
|
struct sys_device *s = &c->sysdev;
|
2007-01-28 22:25:57 -05:00
|
|
|
struct sysdev_attribute *attrs, *pmc_attrs;
|
|
|
|
int i, nattrs;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2006-11-12 22:46:04 -05:00
|
|
|
if (!firmware_has_feature(FW_FEATURE_ISERIES) &&
|
|
|
|
cpu_has_feature(CPU_FTR_SMT))
|
2005-04-16 18:20:36 -04:00
|
|
|
sysdev_create_file(s, &attr_smt_snooze_delay);
|
|
|
|
|
|
|
|
/* PMC stuff */
|
2007-01-28 22:25:57 -05:00
|
|
|
switch (cur_cpu_spec->pmc_type) {
|
|
|
|
case PPC_PMC_IBM:
|
|
|
|
attrs = ibm_common_attrs;
|
|
|
|
nattrs = sizeof(ibm_common_attrs) / sizeof(struct sysdev_attribute);
|
|
|
|
pmc_attrs = ibm_pmc_attrs;
|
|
|
|
break;
|
|
|
|
case PPC_PMC_PA6T:
|
|
|
|
/* PA Semi starts counting at PMC0 */
|
|
|
|
attrs = pa6t_attrs;
|
|
|
|
nattrs = sizeof(pa6t_attrs) / sizeof(struct sysdev_attribute);
|
|
|
|
pmc_attrs = NULL;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
attrs = NULL;
|
|
|
|
nattrs = 0;
|
|
|
|
pmc_attrs = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < nattrs; i++)
|
|
|
|
sysdev_create_file(s, &attrs[i]);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2007-01-28 22:25:57 -05:00
|
|
|
if (pmc_attrs)
|
|
|
|
for (i = 0; i < cur_cpu_spec->num_pmcs; i++)
|
|
|
|
sysdev_create_file(s, &pmc_attrs[i]);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
if (cpu_has_feature(CPU_FTR_MMCRA))
|
|
|
|
sysdev_create_file(s, &attr_mmcra);
|
|
|
|
|
2006-07-27 23:58:37 -04:00
|
|
|
if (cpu_has_feature(CPU_FTR_PURR))
|
2005-04-16 18:20:36 -04:00
|
|
|
sysdev_create_file(s, &attr_purr);
|
2006-12-08 01:46:58 -05:00
|
|
|
|
2006-12-08 01:51:13 -05:00
|
|
|
if (cpu_has_feature(CPU_FTR_SPURR))
|
|
|
|
sysdev_create_file(s, &attr_spurr);
|
|
|
|
|
2006-12-08 01:46:58 -05:00
|
|
|
if (cpu_has_feature(CPU_FTR_DSCR))
|
|
|
|
sysdev_create_file(s, &attr_dscr);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
static void unregister_cpu_online(unsigned int cpu)
|
|
|
|
{
|
|
|
|
struct cpu *c = &per_cpu(cpu_devices, cpu);
|
|
|
|
struct sys_device *s = &c->sysdev;
|
2007-01-28 22:25:57 -05:00
|
|
|
struct sysdev_attribute *attrs, *pmc_attrs;
|
|
|
|
int i, nattrs;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2006-12-06 20:14:10 -05:00
|
|
|
BUG_ON(!c->hotpluggable);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2006-11-12 22:46:04 -05:00
|
|
|
if (!firmware_has_feature(FW_FEATURE_ISERIES) &&
|
|
|
|
cpu_has_feature(CPU_FTR_SMT))
|
2005-04-16 18:20:36 -04:00
|
|
|
sysdev_remove_file(s, &attr_smt_snooze_delay);
|
|
|
|
|
|
|
|
/* PMC stuff */
|
2007-01-28 22:25:57 -05:00
|
|
|
switch (cur_cpu_spec->pmc_type) {
|
|
|
|
case PPC_PMC_IBM:
|
|
|
|
attrs = ibm_common_attrs;
|
|
|
|
nattrs = sizeof(ibm_common_attrs) / sizeof(struct sysdev_attribute);
|
|
|
|
pmc_attrs = ibm_pmc_attrs;
|
|
|
|
break;
|
|
|
|
case PPC_PMC_PA6T:
|
|
|
|
/* PA Semi starts counting at PMC0 */
|
|
|
|
attrs = pa6t_attrs;
|
|
|
|
nattrs = sizeof(pa6t_attrs) / sizeof(struct sysdev_attribute);
|
|
|
|
pmc_attrs = NULL;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
attrs = NULL;
|
|
|
|
nattrs = 0;
|
|
|
|
pmc_attrs = NULL;
|
|
|
|
}
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2007-01-28 22:25:57 -05:00
|
|
|
for (i = 0; i < nattrs; i++)
|
|
|
|
sysdev_remove_file(s, &attrs[i]);
|
|
|
|
|
|
|
|
if (pmc_attrs)
|
|
|
|
for (i = 0; i < cur_cpu_spec->num_pmcs; i++)
|
|
|
|
sysdev_remove_file(s, &pmc_attrs[i]);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
if (cpu_has_feature(CPU_FTR_MMCRA))
|
|
|
|
sysdev_remove_file(s, &attr_mmcra);
|
|
|
|
|
2006-07-27 23:58:37 -04:00
|
|
|
if (cpu_has_feature(CPU_FTR_PURR))
|
2005-04-16 18:20:36 -04:00
|
|
|
sysdev_remove_file(s, &attr_purr);
|
2006-12-08 01:46:58 -05:00
|
|
|
|
2006-12-08 01:51:13 -05:00
|
|
|
if (cpu_has_feature(CPU_FTR_SPURR))
|
|
|
|
sysdev_remove_file(s, &attr_spurr);
|
|
|
|
|
2006-12-08 01:46:58 -05:00
|
|
|
if (cpu_has_feature(CPU_FTR_DSCR))
|
|
|
|
sysdev_remove_file(s, &attr_dscr);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
#endif /* CONFIG_HOTPLUG_CPU */
|
|
|
|
|
2006-07-30 06:03:35 -04:00
|
|
|
static int __cpuinit sysfs_cpu_notify(struct notifier_block *self,
|
2005-04-16 18:20:36 -04:00
|
|
|
unsigned long action, void *hcpu)
|
|
|
|
{
|
|
|
|
unsigned int cpu = (unsigned int)(long)hcpu;
|
|
|
|
|
|
|
|
switch (action) {
|
|
|
|
case CPU_ONLINE:
|
2007-05-09 05:35:10 -04:00
|
|
|
case CPU_ONLINE_FROZEN:
|
2005-04-16 18:20:36 -04:00
|
|
|
register_cpu_online(cpu);
|
|
|
|
break;
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
case CPU_DEAD:
|
2007-05-09 05:35:10 -04:00
|
|
|
case CPU_DEAD_FROZEN:
|
2005-04-16 18:20:36 -04:00
|
|
|
unregister_cpu_online(cpu);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
return NOTIFY_OK;
|
|
|
|
}
|
|
|
|
|
2006-07-30 06:03:35 -04:00
|
|
|
static struct notifier_block __cpuinitdata sysfs_cpu_nb = {
|
2005-04-16 18:20:36 -04:00
|
|
|
.notifier_call = sysfs_cpu_notify,
|
|
|
|
};
|
|
|
|
|
2006-10-24 12:31:24 -04:00
|
|
|
static DEFINE_MUTEX(cpu_mutex);
|
|
|
|
|
|
|
|
int cpu_add_sysdev_attr(struct sysdev_attribute *attr)
|
|
|
|
{
|
|
|
|
int cpu;
|
|
|
|
|
|
|
|
mutex_lock(&cpu_mutex);
|
|
|
|
|
|
|
|
for_each_possible_cpu(cpu) {
|
|
|
|
sysdev_create_file(get_cpu_sysdev(cpu), attr);
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&cpu_mutex);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(cpu_add_sysdev_attr);
|
|
|
|
|
|
|
|
int cpu_add_sysdev_attr_group(struct attribute_group *attrs)
|
|
|
|
{
|
|
|
|
int cpu;
|
|
|
|
struct sys_device *sysdev;
|
2007-09-04 22:43:17 -04:00
|
|
|
int ret;
|
2006-10-24 12:31:24 -04:00
|
|
|
|
|
|
|
mutex_lock(&cpu_mutex);
|
|
|
|
|
|
|
|
for_each_possible_cpu(cpu) {
|
|
|
|
sysdev = get_cpu_sysdev(cpu);
|
2007-09-04 22:43:17 -04:00
|
|
|
ret = sysfs_create_group(&sysdev->kobj, attrs);
|
|
|
|
WARN_ON(ret != 0);
|
2006-10-24 12:31:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&cpu_mutex);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(cpu_add_sysdev_attr_group);
|
|
|
|
|
|
|
|
|
|
|
|
void cpu_remove_sysdev_attr(struct sysdev_attribute *attr)
|
|
|
|
{
|
|
|
|
int cpu;
|
|
|
|
|
|
|
|
mutex_lock(&cpu_mutex);
|
|
|
|
|
|
|
|
for_each_possible_cpu(cpu) {
|
|
|
|
sysdev_remove_file(get_cpu_sysdev(cpu), attr);
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&cpu_mutex);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(cpu_remove_sysdev_attr);
|
|
|
|
|
|
|
|
void cpu_remove_sysdev_attr_group(struct attribute_group *attrs)
|
|
|
|
{
|
|
|
|
int cpu;
|
|
|
|
struct sys_device *sysdev;
|
|
|
|
|
|
|
|
mutex_lock(&cpu_mutex);
|
|
|
|
|
|
|
|
for_each_possible_cpu(cpu) {
|
|
|
|
sysdev = get_cpu_sysdev(cpu);
|
|
|
|
sysfs_remove_group(&sysdev->kobj, attrs);
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&cpu_mutex);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(cpu_remove_sysdev_attr_group);
|
|
|
|
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
/* NUMA stuff */
|
|
|
|
|
|
|
|
#ifdef CONFIG_NUMA
|
|
|
|
static void register_nodes(void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2006-06-27 05:53:38 -04:00
|
|
|
for (i = 0; i < MAX_NUMNODES; i++)
|
|
|
|
register_one_node(i);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
2006-05-01 15:16:12 -04:00
|
|
|
|
|
|
|
int sysfs_add_device_to_node(struct sys_device *dev, int nid)
|
|
|
|
{
|
|
|
|
struct node *node = &node_devices[nid];
|
|
|
|
return sysfs_create_link(&node->sysdev.kobj, &dev->kobj,
|
|
|
|
kobject_name(&dev->kobj));
|
|
|
|
}
|
2007-07-05 05:35:33 -04:00
|
|
|
EXPORT_SYMBOL_GPL(sysfs_add_device_to_node);
|
2006-05-01 15:16:12 -04:00
|
|
|
|
|
|
|
void sysfs_remove_device_from_node(struct sys_device *dev, int nid)
|
|
|
|
{
|
|
|
|
struct node *node = &node_devices[nid];
|
|
|
|
sysfs_remove_link(&node->sysdev.kobj, kobject_name(&dev->kobj));
|
|
|
|
}
|
2007-07-05 05:35:33 -04:00
|
|
|
EXPORT_SYMBOL_GPL(sysfs_remove_device_from_node);
|
2006-05-01 15:16:12 -04:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
#else
|
|
|
|
static void register_nodes(void)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2006-05-01 15:16:12 -04:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Only valid if CPU is present. */
|
|
|
|
static ssize_t show_physical_id(struct sys_device *dev, char *buf)
|
|
|
|
{
|
|
|
|
struct cpu *cpu = container_of(dev, struct cpu, sysdev);
|
|
|
|
|
|
|
|
return sprintf(buf, "%d\n", get_hard_smp_processor_id(cpu->sysdev.id));
|
|
|
|
}
|
|
|
|
static SYSDEV_ATTR(physical_id, 0444, show_physical_id, NULL);
|
|
|
|
|
|
|
|
static int __init topology_init(void)
|
|
|
|
{
|
|
|
|
int cpu;
|
|
|
|
|
|
|
|
register_nodes();
|
|
|
|
register_cpu_notifier(&sysfs_cpu_nb);
|
|
|
|
|
2006-03-28 17:50:51 -05:00
|
|
|
for_each_possible_cpu(cpu) {
|
2005-04-16 18:20:36 -04:00
|
|
|
struct cpu *c = &per_cpu(cpu_devices, cpu);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For now, we just see if the system supports making
|
|
|
|
* the RTAS calls for CPU hotplug. But, there may be a
|
|
|
|
* more comprehensive way to do this for an individual
|
|
|
|
* CPU. For instance, the boot cpu might never be valid
|
|
|
|
* for hotplugging.
|
|
|
|
*/
|
2006-12-06 20:14:10 -05:00
|
|
|
if (ppc_md.cpu_die)
|
|
|
|
c->hotpluggable = 1;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2006-12-06 20:14:10 -05:00
|
|
|
if (cpu_online(cpu) || c->hotpluggable) {
|
[PATCH] node hotplug: register cpu: remove node struct
With Goto-san's patch, we can add new pgdat/node at runtime. I'm now
considering node-hot-add with cpu + memory on ACPI.
I found acpi container, which describes node, could evaluate cpu before
memory. This means cpu-hot-add occurs before memory hot add.
In most part, cpu-hot-add doesn't depend on node hot add. But register_cpu(),
which creates symbolic link from node to cpu, requires that node should be
onlined before register_cpu(). When a node is onlined, its pgdat should be
there.
This patch-set holds off creating symbolic link from node to cpu
until node is onlined.
This removes node arguments from register_cpu().
Now, register_cpu() requires 'struct node' as its argument. But the array of
struct node is now unified in driver/base/node.c now (By Goto's node hotplug
patch). We can get struct node in generic way. So, this argument is not
necessary now.
This patch also guarantees add cpu under node only when node is onlined. It
is necessary for node-hot-add vs. cpu-hot-add patch following this.
Moreover, register_cpu calculates cpu->node_id by cpu_to_node() without regard
to its 'struct node *root' argument. This patch removes it.
Also modify callers of register_cpu()/unregister_cpu, whose args are changed
by register-cpu-remove-node-struct patch.
[Brice.Goglin@ens-lyon.org: fix it]
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-27 05:53:41 -04:00
|
|
|
register_cpu(c, cpu);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
sysdev_create_file(&c->sysdev, &attr_physical_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cpu_online(cpu))
|
|
|
|
register_cpu_online(cpu);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2007-05-02 13:11:49 -04:00
|
|
|
subsys_initcall(topology_init);
|