2011-12-21 22:29:42 +00:00
|
|
|
#include <linux/device.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <linux/cpu.h>
|
|
|
|
#include <linux/smp.h>
|
|
|
|
#include <linux/percpu.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/sched.h>
|
2011-07-22 22:24:23 +00:00
|
|
|
#include <linux/export.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
#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 04:35:25 +00:00
|
|
|
#include <asm/firmware.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <asm/hvcall.h>
|
|
|
|
#include <asm/prom.h>
|
|
|
|
#include <asm/machdep.h>
|
2005-11-07 02:18:13 +00:00
|
|
|
#include <asm/smp.h>
|
powerpc: Fix bug where perf_counters breaks oprofile
Currently there is a bug where if you use oprofile on a pSeries
machine, then use perf_counters, then use oprofile again, oprofile
will not work correctly; it will lose the PMU configuration the next
time the hypervisor does a partition context switch, and thereafter
won't count anything.
Maynard Johnson identified the sequence causing the problem:
- oprofile setup calls ppc_enable_pmcs(), which calls
pseries_lpar_enable_pmcs, which tells the hypervisor that we want
to use the PMU, and sets the "PMU in use" flag in the lppaca.
This flag tells the hypervisor whether it needs to save and restore
the PMU config.
- The perf_counter code sets and clears the "PMU in use" flag directly
as it context-switches the PMU between tasks, and leaves it clear
when it finishes.
- oprofile setup, called for a new oprofile run, calls ppc_enable_pmcs,
which does nothing because it has already been called. In particular
it doesn't set the "PMU in use" flag.
This fixes the problem by arranging for ppc_enable_pmcs to always set
the "PMU in use" flag. It makes the perf_counter code call
ppc_enable_pmcs also rather than calling the lower-level function
directly, and removes the setting of the "PMU in use" flag from
pseries_lpar_enable_pmcs, since that is now done in its caller.
This also removes the declaration of pasemi_enable_pmcs because it
isn't defined anywhere.
Reported-by: Maynard Johnson <mpjohn@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Cc: <stable@kernel.org)
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2009-09-09 01:26:03 +00:00
|
|
|
#include <asm/pmc.h>
|
2011-11-30 02:46:42 +00:00
|
|
|
#include <asm/system.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-12-23 18:55:54 +00:00
|
|
|
#include "cacheinfo.h"
|
|
|
|
|
2008-08-18 04:23:51 +00:00
|
|
|
#ifdef CONFIG_PPC64
|
|
|
|
#include <asm/paca.h>
|
|
|
|
#include <asm/lppaca.h>
|
|
|
|
#endif
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
static DEFINE_PER_CPU(struct cpu, cpu_devices);
|
|
|
|
|
2008-08-18 04:23:51 +00:00
|
|
|
/*
|
|
|
|
* SMT snooze delay stuff, 64-bit only for now
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef CONFIG_PPC64
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-09-22 10:30:14 +00:00
|
|
|
/* Time in microseconds we delay before sleeping in the idle loop */
|
2010-05-16 20:02:39 +00:00
|
|
|
DEFINE_PER_CPU(long, smt_snooze_delay) = { 100 };
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
static ssize_t store_smt_snooze_delay(struct device *dev,
|
|
|
|
struct device_attribute *attr,
|
2008-07-01 16:48:41 +00:00
|
|
|
const char *buf,
|
2005-04-16 22:20:36 +00:00
|
|
|
size_t count)
|
|
|
|
{
|
2011-12-21 22:29:42 +00:00
|
|
|
struct cpu *cpu = container_of(dev, struct cpu, dev);
|
2005-04-16 22:20:36 +00:00
|
|
|
ssize_t ret;
|
2010-05-16 20:02:39 +00:00
|
|
|
long snooze;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2010-05-16 20:02:39 +00:00
|
|
|
ret = sscanf(buf, "%ld", &snooze);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (ret != 1)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
per_cpu(smt_snooze_delay, cpu->dev.id) = snooze;
|
2011-11-30 02:46:42 +00:00
|
|
|
update_smt_snooze_delay(snooze);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
static ssize_t show_smt_snooze_delay(struct device *dev,
|
|
|
|
struct device_attribute *attr,
|
2008-07-01 16:48:41 +00:00
|
|
|
char *buf)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2011-12-21 22:29:42 +00:00
|
|
|
struct cpu *cpu = container_of(dev, struct cpu, dev);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
return sprintf(buf, "%ld\n", per_cpu(smt_snooze_delay, cpu->dev.id));
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
static DEVICE_ATTR(smt_snooze_delay, 0644, show_smt_snooze_delay,
|
2005-04-16 22:20:36 +00:00
|
|
|
store_smt_snooze_delay);
|
|
|
|
|
|
|
|
static int __init setup_smt_snooze_delay(char *str)
|
|
|
|
{
|
|
|
|
unsigned int cpu;
|
2010-05-16 20:02:39 +00:00
|
|
|
long snooze;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (!cpu_has_feature(CPU_FTR_SMT))
|
|
|
|
return 1;
|
|
|
|
|
2010-05-16 20:02:39 +00:00
|
|
|
snooze = simple_strtol(str, NULL, 10);
|
|
|
|
for_each_possible_cpu(cpu)
|
|
|
|
per_cpu(smt_snooze_delay, cpu) = snooze;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
__setup("smt-snooze-delay=", setup_smt_snooze_delay);
|
|
|
|
|
2008-08-18 04:23:51 +00:00
|
|
|
#endif /* CONFIG_PPC64 */
|
2005-08-09 01:13:36 +00:00
|
|
|
|
2005-04-16 22:20:36 +00: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);
|
|
|
|
|
2008-08-18 04:23:51 +00:00
|
|
|
void ppc_enable_pmcs(void)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
powerpc: Fix bug where perf_counters breaks oprofile
Currently there is a bug where if you use oprofile on a pSeries
machine, then use perf_counters, then use oprofile again, oprofile
will not work correctly; it will lose the PMU configuration the next
time the hypervisor does a partition context switch, and thereafter
won't count anything.
Maynard Johnson identified the sequence causing the problem:
- oprofile setup calls ppc_enable_pmcs(), which calls
pseries_lpar_enable_pmcs, which tells the hypervisor that we want
to use the PMU, and sets the "PMU in use" flag in the lppaca.
This flag tells the hypervisor whether it needs to save and restore
the PMU config.
- The perf_counter code sets and clears the "PMU in use" flag directly
as it context-switches the PMU between tasks, and leaves it clear
when it finishes.
- oprofile setup, called for a new oprofile run, calls ppc_enable_pmcs,
which does nothing because it has already been called. In particular
it doesn't set the "PMU in use" flag.
This fixes the problem by arranging for ppc_enable_pmcs to always set
the "PMU in use" flag. It makes the perf_counter code call
ppc_enable_pmcs also rather than calling the lower-level function
directly, and removes the setting of the "PMU in use" flag from
pseries_lpar_enable_pmcs, since that is now done in its caller.
This also removes the declaration of pasemi_enable_pmcs because it
isn't defined anywhere.
Reported-by: Maynard Johnson <mpjohn@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Cc: <stable@kernel.org)
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2009-09-09 01:26:03 +00:00
|
|
|
ppc_set_pmu_inuse(1);
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Only need to enable them once */
|
|
|
|
if (__get_cpu_var(pmcs_enabled))
|
|
|
|
return;
|
|
|
|
|
|
|
|
__get_cpu_var(pmcs_enabled) = 1;
|
|
|
|
|
2005-08-09 01:13:36 +00:00
|
|
|
if (ppc_md.enable_pmcs)
|
|
|
|
ppc_md.enable_pmcs();
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2008-08-18 04:23:51 +00:00
|
|
|
EXPORT_SYMBOL(ppc_enable_pmcs);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
#define SYSFS_PMCSETUP(NAME, ADDRESS) \
|
2009-03-11 12:20:05 +00:00
|
|
|
static void read_##NAME(void *val) \
|
2005-04-16 22:20:36 +00:00
|
|
|
{ \
|
2009-03-26 19:29:06 +00:00
|
|
|
*(unsigned long *)val = mfspr(ADDRESS); \
|
2005-04-16 22:20:36 +00:00
|
|
|
} \
|
2009-03-26 19:29:06 +00:00
|
|
|
static void write_##NAME(void *val) \
|
2005-04-16 22:20:36 +00:00
|
|
|
{ \
|
2008-08-18 04:23:51 +00:00
|
|
|
ppc_enable_pmcs(); \
|
2009-03-11 12:20:05 +00:00
|
|
|
mtspr(ADDRESS, *(unsigned long *)val); \
|
2005-04-16 22:20:36 +00:00
|
|
|
} \
|
2011-12-21 22:29:42 +00:00
|
|
|
static ssize_t show_##NAME(struct device *dev, \
|
|
|
|
struct device_attribute *attr, \
|
2008-07-01 16:48:41 +00:00
|
|
|
char *buf) \
|
2005-04-16 22:20:36 +00:00
|
|
|
{ \
|
2011-12-21 22:29:42 +00:00
|
|
|
struct cpu *cpu = container_of(dev, struct cpu, dev); \
|
2009-03-11 12:20:05 +00:00
|
|
|
unsigned long val; \
|
2011-12-21 22:29:42 +00:00
|
|
|
smp_call_function_single(cpu->dev.id, read_##NAME, &val, 1); \
|
2005-04-16 22:20:36 +00:00
|
|
|
return sprintf(buf, "%lx\n", val); \
|
|
|
|
} \
|
2008-01-24 21:16:20 +00:00
|
|
|
static ssize_t __used \
|
2011-12-21 22:29:42 +00:00
|
|
|
store_##NAME(struct device *dev, struct device_attribute *attr, \
|
2008-07-01 16:48:41 +00:00
|
|
|
const char *buf, size_t count) \
|
2005-04-16 22:20:36 +00:00
|
|
|
{ \
|
2011-12-21 22:29:42 +00:00
|
|
|
struct cpu *cpu = container_of(dev, struct cpu, dev); \
|
2005-04-16 22:20:36 +00:00
|
|
|
unsigned long val; \
|
|
|
|
int ret = sscanf(buf, "%lx", &val); \
|
|
|
|
if (ret != 1) \
|
|
|
|
return -EINVAL; \
|
2011-12-21 22:29:42 +00:00
|
|
|
smp_call_function_single(cpu->dev.id, write_##NAME, &val, 1); \
|
2005-04-16 22:20:36 +00:00
|
|
|
return count; \
|
|
|
|
}
|
|
|
|
|
2007-01-29 03:25:57 +00:00
|
|
|
|
|
|
|
/* Let's define all possible registers, we'll only hook up the ones
|
|
|
|
* that are implemented on the current processor
|
|
|
|
*/
|
|
|
|
|
2008-09-18 22:50:42 +00:00
|
|
|
#if defined(CONFIG_PPC64)
|
2008-08-18 04:23:51 +00:00
|
|
|
#define HAS_PPC_PMC_CLASSIC 1
|
|
|
|
#define HAS_PPC_PMC_IBM 1
|
|
|
|
#define HAS_PPC_PMC_PA6T 1
|
2008-09-18 22:50:42 +00:00
|
|
|
#elif defined(CONFIG_6xx)
|
2008-08-18 04:23:51 +00:00
|
|
|
#define HAS_PPC_PMC_CLASSIC 1
|
|
|
|
#define HAS_PPC_PMC_IBM 1
|
|
|
|
#define HAS_PPC_PMC_G4 1
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef HAS_PPC_PMC_CLASSIC
|
2005-04-16 22:20:36 +00:00
|
|
|
SYSFS_PMCSETUP(mmcr0, SPRN_MMCR0);
|
|
|
|
SYSFS_PMCSETUP(mmcr1, SPRN_MMCR1);
|
|
|
|
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);
|
2008-08-18 04:23:51 +00:00
|
|
|
|
|
|
|
#ifdef HAS_PPC_PMC_G4
|
|
|
|
SYSFS_PMCSETUP(mmcr2, SPRN_MMCR2);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_PPC64
|
2005-04-16 22:20:36 +00:00
|
|
|
SYSFS_PMCSETUP(pmc7, SPRN_PMC7);
|
|
|
|
SYSFS_PMCSETUP(pmc8, SPRN_PMC8);
|
2008-08-18 04:23:51 +00:00
|
|
|
|
|
|
|
SYSFS_PMCSETUP(mmcra, SPRN_MMCRA);
|
2005-04-16 22:20:36 +00:00
|
|
|
SYSFS_PMCSETUP(purr, SPRN_PURR);
|
2006-12-08 06:51:13 +00:00
|
|
|
SYSFS_PMCSETUP(spurr, SPRN_SPURR);
|
2006-12-08 06:46:58 +00:00
|
|
|
SYSFS_PMCSETUP(dscr, SPRN_DSCR);
|
2011-11-10 19:58:53 +00:00
|
|
|
SYSFS_PMCSETUP(pir, SPRN_PIR);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
static DEVICE_ATTR(mmcra, 0600, show_mmcra, store_mmcra);
|
|
|
|
static DEVICE_ATTR(spurr, 0600, show_spurr, NULL);
|
|
|
|
static DEVICE_ATTR(dscr, 0600, show_dscr, store_dscr);
|
|
|
|
static DEVICE_ATTR(purr, 0600, show_purr, store_purr);
|
2012-01-07 20:03:30 +00:00
|
|
|
static DEVICE_ATTR(pir, 0400, show_pir, NULL);
|
2011-03-02 15:18:48 +00:00
|
|
|
|
|
|
|
unsigned long dscr_default = 0;
|
|
|
|
EXPORT_SYMBOL(dscr_default);
|
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
static ssize_t show_dscr_default(struct device *dev,
|
|
|
|
struct device_attribute *attr, char *buf)
|
2011-03-02 15:18:48 +00:00
|
|
|
{
|
|
|
|
return sprintf(buf, "%lx\n", dscr_default);
|
|
|
|
}
|
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
static ssize_t __used store_dscr_default(struct device *dev,
|
|
|
|
struct device_attribute *attr, const char *buf,
|
2011-03-02 15:18:48 +00:00
|
|
|
size_t count)
|
|
|
|
{
|
|
|
|
unsigned long val;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
ret = sscanf(buf, "%lx", &val);
|
|
|
|
if (ret != 1)
|
|
|
|
return -EINVAL;
|
|
|
|
dscr_default = val;
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
static DEVICE_ATTR(dscr_default, 0600,
|
2011-03-02 15:18:48 +00:00
|
|
|
show_dscr_default, store_dscr_default);
|
|
|
|
|
|
|
|
static void sysfs_create_dscr_default(void)
|
|
|
|
{
|
|
|
|
int err = 0;
|
|
|
|
if (cpu_has_feature(CPU_FTR_DSCR))
|
2011-12-21 22:29:42 +00:00
|
|
|
err = device_create_file(cpu_subsys.dev_root, &dev_attr_dscr_default);
|
2011-03-02 15:18:48 +00:00
|
|
|
}
|
2008-08-18 04:23:51 +00:00
|
|
|
#endif /* CONFIG_PPC64 */
|
|
|
|
|
|
|
|
#ifdef HAS_PPC_PMC_PA6T
|
2007-04-18 06:38:21 +00: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-09-05 02:09:06 +00: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 */
|
2008-08-18 04:23:51 +00:00
|
|
|
#endif /* HAS_PPC_PMC_PA6T */
|
2007-01-29 03:25:57 +00:00
|
|
|
|
2008-08-18 04:23:51 +00:00
|
|
|
#ifdef HAS_PPC_PMC_IBM
|
2011-12-21 22:29:42 +00:00
|
|
|
static struct device_attribute ibm_common_attrs[] = {
|
|
|
|
__ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
|
|
|
|
__ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
|
2007-01-29 03:25:57 +00:00
|
|
|
};
|
2008-08-18 04:23:51 +00:00
|
|
|
#endif /* HAS_PPC_PMC_G4 */
|
|
|
|
|
|
|
|
#ifdef HAS_PPC_PMC_G4
|
2011-12-21 22:29:42 +00:00
|
|
|
static struct device_attribute g4_common_attrs[] = {
|
|
|
|
__ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
|
|
|
|
__ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
|
|
|
|
__ATTR(mmcr2, 0600, show_mmcr2, store_mmcr2),
|
2008-08-18 04:23:51 +00:00
|
|
|
};
|
|
|
|
#endif /* HAS_PPC_PMC_G4 */
|
2007-01-29 03:25:57 +00:00
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
static struct device_attribute classic_pmc_attrs[] = {
|
|
|
|
__ATTR(pmc1, 0600, show_pmc1, store_pmc1),
|
|
|
|
__ATTR(pmc2, 0600, show_pmc2, store_pmc2),
|
|
|
|
__ATTR(pmc3, 0600, show_pmc3, store_pmc3),
|
|
|
|
__ATTR(pmc4, 0600, show_pmc4, store_pmc4),
|
|
|
|
__ATTR(pmc5, 0600, show_pmc5, store_pmc5),
|
|
|
|
__ATTR(pmc6, 0600, show_pmc6, store_pmc6),
|
2008-08-18 04:23:51 +00:00
|
|
|
#ifdef CONFIG_PPC64
|
2011-12-21 22:29:42 +00:00
|
|
|
__ATTR(pmc7, 0600, show_pmc7, store_pmc7),
|
|
|
|
__ATTR(pmc8, 0600, show_pmc8, store_pmc8),
|
2008-08-18 04:23:51 +00:00
|
|
|
#endif
|
2007-01-29 03:25:57 +00:00
|
|
|
};
|
|
|
|
|
2008-08-18 04:23:51 +00:00
|
|
|
#ifdef HAS_PPC_PMC_PA6T
|
2011-12-21 22:29:42 +00:00
|
|
|
static struct device_attribute pa6t_attrs[] = {
|
|
|
|
__ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
|
|
|
|
__ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
|
|
|
|
__ATTR(pmc0, 0600, show_pa6t_pmc0, store_pa6t_pmc0),
|
|
|
|
__ATTR(pmc1, 0600, show_pa6t_pmc1, store_pa6t_pmc1),
|
|
|
|
__ATTR(pmc2, 0600, show_pa6t_pmc2, store_pa6t_pmc2),
|
|
|
|
__ATTR(pmc3, 0600, show_pa6t_pmc3, store_pa6t_pmc3),
|
|
|
|
__ATTR(pmc4, 0600, show_pa6t_pmc4, store_pa6t_pmc4),
|
|
|
|
__ATTR(pmc5, 0600, show_pa6t_pmc5, store_pa6t_pmc5),
|
2007-09-05 02:09:06 +00:00
|
|
|
#ifdef CONFIG_DEBUG_KERNEL
|
2011-12-21 22:29:42 +00:00
|
|
|
__ATTR(hid0, 0600, show_hid0, store_hid0),
|
|
|
|
__ATTR(hid1, 0600, show_hid1, store_hid1),
|
|
|
|
__ATTR(hid4, 0600, show_hid4, store_hid4),
|
|
|
|
__ATTR(hid5, 0600, show_hid5, store_hid5),
|
|
|
|
__ATTR(ima0, 0600, show_ima0, store_ima0),
|
|
|
|
__ATTR(ima1, 0600, show_ima1, store_ima1),
|
|
|
|
__ATTR(ima2, 0600, show_ima2, store_ima2),
|
|
|
|
__ATTR(ima3, 0600, show_ima3, store_ima3),
|
|
|
|
__ATTR(ima4, 0600, show_ima4, store_ima4),
|
|
|
|
__ATTR(ima5, 0600, show_ima5, store_ima5),
|
|
|
|
__ATTR(ima6, 0600, show_ima6, store_ima6),
|
|
|
|
__ATTR(ima7, 0600, show_ima7, store_ima7),
|
|
|
|
__ATTR(ima8, 0600, show_ima8, store_ima8),
|
|
|
|
__ATTR(ima9, 0600, show_ima9, store_ima9),
|
|
|
|
__ATTR(imaat, 0600, show_imaat, store_imaat),
|
|
|
|
__ATTR(btcr, 0600, show_btcr, store_btcr),
|
|
|
|
__ATTR(pccr, 0600, show_pccr, store_pccr),
|
|
|
|
__ATTR(rpccr, 0600, show_rpccr, store_rpccr),
|
|
|
|
__ATTR(der, 0600, show_der, store_der),
|
|
|
|
__ATTR(mer, 0600, show_mer, store_mer),
|
|
|
|
__ATTR(ber, 0600, show_ber, store_ber),
|
|
|
|
__ATTR(ier, 0600, show_ier, store_ier),
|
|
|
|
__ATTR(sier, 0600, show_sier, store_sier),
|
|
|
|
__ATTR(siar, 0600, show_siar, store_siar),
|
|
|
|
__ATTR(tsr0, 0600, show_tsr0, store_tsr0),
|
|
|
|
__ATTR(tsr1, 0600, show_tsr1, store_tsr1),
|
|
|
|
__ATTR(tsr2, 0600, show_tsr2, store_tsr2),
|
|
|
|
__ATTR(tsr3, 0600, show_tsr3, store_tsr3),
|
2007-09-05 02:09:06 +00:00
|
|
|
#endif /* CONFIG_DEBUG_KERNEL */
|
2007-01-29 03:25:57 +00:00
|
|
|
};
|
2008-08-18 04:23:51 +00:00
|
|
|
#endif /* HAS_PPC_PMC_PA6T */
|
|
|
|
#endif /* HAS_PPC_PMC_CLASSIC */
|
2007-01-29 03:25:57 +00:00
|
|
|
|
2008-07-27 05:24:51 +00:00
|
|
|
static void __cpuinit register_cpu_online(unsigned int cpu)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct cpu *c = &per_cpu(cpu_devices, cpu);
|
2011-12-21 22:29:42 +00:00
|
|
|
struct device *s = &c->dev;
|
|
|
|
struct device_attribute *attrs, *pmc_attrs;
|
2007-01-29 03:25:57 +00:00
|
|
|
int i, nattrs;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-08-18 04:23:51 +00:00
|
|
|
#ifdef CONFIG_PPC64
|
2006-11-13 03:46:04 +00:00
|
|
|
if (!firmware_has_feature(FW_FEATURE_ISERIES) &&
|
|
|
|
cpu_has_feature(CPU_FTR_SMT))
|
2011-12-21 22:29:42 +00:00
|
|
|
device_create_file(s, &dev_attr_smt_snooze_delay);
|
2008-08-18 04:23:51 +00:00
|
|
|
#endif
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* PMC stuff */
|
2007-01-29 03:25:57 +00:00
|
|
|
switch (cur_cpu_spec->pmc_type) {
|
2008-08-18 04:23:51 +00:00
|
|
|
#ifdef HAS_PPC_PMC_IBM
|
2007-01-29 03:25:57 +00:00
|
|
|
case PPC_PMC_IBM:
|
|
|
|
attrs = ibm_common_attrs;
|
2011-12-21 22:29:42 +00:00
|
|
|
nattrs = sizeof(ibm_common_attrs) / sizeof(struct device_attribute);
|
2008-08-18 04:23:51 +00:00
|
|
|
pmc_attrs = classic_pmc_attrs;
|
2007-01-29 03:25:57 +00:00
|
|
|
break;
|
2008-08-18 04:23:51 +00:00
|
|
|
#endif /* HAS_PPC_PMC_IBM */
|
|
|
|
#ifdef HAS_PPC_PMC_G4
|
|
|
|
case PPC_PMC_G4:
|
|
|
|
attrs = g4_common_attrs;
|
2011-12-21 22:29:42 +00:00
|
|
|
nattrs = sizeof(g4_common_attrs) / sizeof(struct device_attribute);
|
2008-08-18 04:23:51 +00:00
|
|
|
pmc_attrs = classic_pmc_attrs;
|
|
|
|
break;
|
|
|
|
#endif /* HAS_PPC_PMC_G4 */
|
|
|
|
#ifdef HAS_PPC_PMC_PA6T
|
2007-01-29 03:25:57 +00:00
|
|
|
case PPC_PMC_PA6T:
|
|
|
|
/* PA Semi starts counting at PMC0 */
|
|
|
|
attrs = pa6t_attrs;
|
2011-12-21 22:29:42 +00:00
|
|
|
nattrs = sizeof(pa6t_attrs) / sizeof(struct device_attribute);
|
2007-01-29 03:25:57 +00:00
|
|
|
pmc_attrs = NULL;
|
|
|
|
break;
|
2008-08-18 04:23:51 +00:00
|
|
|
#endif /* HAS_PPC_PMC_PA6T */
|
2007-01-29 03:25:57 +00:00
|
|
|
default:
|
|
|
|
attrs = NULL;
|
|
|
|
nattrs = 0;
|
|
|
|
pmc_attrs = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < nattrs; i++)
|
2011-12-21 22:29:42 +00:00
|
|
|
device_create_file(s, &attrs[i]);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-01-29 03:25:57 +00:00
|
|
|
if (pmc_attrs)
|
|
|
|
for (i = 0; i < cur_cpu_spec->num_pmcs; i++)
|
2011-12-21 22:29:42 +00:00
|
|
|
device_create_file(s, &pmc_attrs[i]);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-08-18 04:23:51 +00:00
|
|
|
#ifdef CONFIG_PPC64
|
2005-04-16 22:20:36 +00:00
|
|
|
if (cpu_has_feature(CPU_FTR_MMCRA))
|
2011-12-21 22:29:42 +00:00
|
|
|
device_create_file(s, &dev_attr_mmcra);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-07-28 03:58:37 +00:00
|
|
|
if (cpu_has_feature(CPU_FTR_PURR))
|
2011-12-21 22:29:42 +00:00
|
|
|
device_create_file(s, &dev_attr_purr);
|
2006-12-08 06:46:58 +00:00
|
|
|
|
2006-12-08 06:51:13 +00:00
|
|
|
if (cpu_has_feature(CPU_FTR_SPURR))
|
2011-12-21 22:29:42 +00:00
|
|
|
device_create_file(s, &dev_attr_spurr);
|
2006-12-08 06:51:13 +00:00
|
|
|
|
2006-12-08 06:46:58 +00:00
|
|
|
if (cpu_has_feature(CPU_FTR_DSCR))
|
2011-12-21 22:29:42 +00:00
|
|
|
device_create_file(s, &dev_attr_dscr);
|
2011-11-10 19:58:53 +00:00
|
|
|
|
|
|
|
if (cpu_has_feature(CPU_FTR_PPCAS_ARCH_V2))
|
2012-01-07 20:03:30 +00:00
|
|
|
device_create_file(s, &dev_attr_pir);
|
2008-08-18 04:23:51 +00:00
|
|
|
#endif /* CONFIG_PPC64 */
|
2008-07-27 05:24:55 +00:00
|
|
|
|
2008-12-23 18:55:54 +00:00
|
|
|
cacheinfo_cpu_online(cpu);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
static void unregister_cpu_online(unsigned int cpu)
|
|
|
|
{
|
|
|
|
struct cpu *c = &per_cpu(cpu_devices, cpu);
|
2011-12-21 22:29:42 +00:00
|
|
|
struct device *s = &c->dev;
|
|
|
|
struct device_attribute *attrs, *pmc_attrs;
|
2007-01-29 03:25:57 +00:00
|
|
|
int i, nattrs;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-12-07 01:14:10 +00:00
|
|
|
BUG_ON(!c->hotpluggable);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-11-16 11:44:42 +00:00
|
|
|
#ifdef CONFIG_PPC64
|
2006-11-13 03:46:04 +00:00
|
|
|
if (!firmware_has_feature(FW_FEATURE_ISERIES) &&
|
|
|
|
cpu_has_feature(CPU_FTR_SMT))
|
2011-12-21 22:29:42 +00:00
|
|
|
device_remove_file(s, &dev_attr_smt_snooze_delay);
|
2008-11-16 11:44:42 +00:00
|
|
|
#endif
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* PMC stuff */
|
2007-01-29 03:25:57 +00:00
|
|
|
switch (cur_cpu_spec->pmc_type) {
|
2008-08-18 04:23:51 +00:00
|
|
|
#ifdef HAS_PPC_PMC_IBM
|
2007-01-29 03:25:57 +00:00
|
|
|
case PPC_PMC_IBM:
|
|
|
|
attrs = ibm_common_attrs;
|
2011-12-21 22:29:42 +00:00
|
|
|
nattrs = sizeof(ibm_common_attrs) / sizeof(struct device_attribute);
|
2008-08-18 04:23:51 +00:00
|
|
|
pmc_attrs = classic_pmc_attrs;
|
|
|
|
break;
|
|
|
|
#endif /* HAS_PPC_PMC_IBM */
|
|
|
|
#ifdef HAS_PPC_PMC_G4
|
|
|
|
case PPC_PMC_G4:
|
|
|
|
attrs = g4_common_attrs;
|
2011-12-21 22:29:42 +00:00
|
|
|
nattrs = sizeof(g4_common_attrs) / sizeof(struct device_attribute);
|
2008-08-18 04:23:51 +00:00
|
|
|
pmc_attrs = classic_pmc_attrs;
|
2007-01-29 03:25:57 +00:00
|
|
|
break;
|
2008-08-18 04:23:51 +00:00
|
|
|
#endif /* HAS_PPC_PMC_G4 */
|
|
|
|
#ifdef HAS_PPC_PMC_PA6T
|
2007-01-29 03:25:57 +00:00
|
|
|
case PPC_PMC_PA6T:
|
|
|
|
/* PA Semi starts counting at PMC0 */
|
|
|
|
attrs = pa6t_attrs;
|
2011-12-21 22:29:42 +00:00
|
|
|
nattrs = sizeof(pa6t_attrs) / sizeof(struct device_attribute);
|
2007-01-29 03:25:57 +00:00
|
|
|
pmc_attrs = NULL;
|
|
|
|
break;
|
2008-08-18 04:23:51 +00:00
|
|
|
#endif /* HAS_PPC_PMC_PA6T */
|
2007-01-29 03:25:57 +00:00
|
|
|
default:
|
|
|
|
attrs = NULL;
|
|
|
|
nattrs = 0;
|
|
|
|
pmc_attrs = NULL;
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-01-29 03:25:57 +00:00
|
|
|
for (i = 0; i < nattrs; i++)
|
2011-12-21 22:29:42 +00:00
|
|
|
device_remove_file(s, &attrs[i]);
|
2007-01-29 03:25:57 +00:00
|
|
|
|
|
|
|
if (pmc_attrs)
|
|
|
|
for (i = 0; i < cur_cpu_spec->num_pmcs; i++)
|
2011-12-21 22:29:42 +00:00
|
|
|
device_remove_file(s, &pmc_attrs[i]);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-08-18 04:23:51 +00:00
|
|
|
#ifdef CONFIG_PPC64
|
2005-04-16 22:20:36 +00:00
|
|
|
if (cpu_has_feature(CPU_FTR_MMCRA))
|
2011-12-21 22:29:42 +00:00
|
|
|
device_remove_file(s, &dev_attr_mmcra);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-07-28 03:58:37 +00:00
|
|
|
if (cpu_has_feature(CPU_FTR_PURR))
|
2011-12-21 22:29:42 +00:00
|
|
|
device_remove_file(s, &dev_attr_purr);
|
2006-12-08 06:46:58 +00:00
|
|
|
|
2006-12-08 06:51:13 +00:00
|
|
|
if (cpu_has_feature(CPU_FTR_SPURR))
|
2011-12-21 22:29:42 +00:00
|
|
|
device_remove_file(s, &dev_attr_spurr);
|
2006-12-08 06:51:13 +00:00
|
|
|
|
2006-12-08 06:46:58 +00:00
|
|
|
if (cpu_has_feature(CPU_FTR_DSCR))
|
2011-12-21 22:29:42 +00:00
|
|
|
device_remove_file(s, &dev_attr_dscr);
|
2011-11-10 19:58:53 +00:00
|
|
|
|
|
|
|
if (cpu_has_feature(CPU_FTR_PPCAS_ARCH_V2))
|
2012-01-07 20:03:30 +00:00
|
|
|
device_remove_file(s, &dev_attr_pir);
|
2008-08-18 04:23:51 +00:00
|
|
|
#endif /* CONFIG_PPC64 */
|
2008-07-27 05:24:55 +00:00
|
|
|
|
2008-12-23 18:55:54 +00:00
|
|
|
cacheinfo_cpu_offline(cpu);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2009-11-25 17:23:25 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
|
|
|
|
ssize_t arch_cpu_probe(const char *buf, size_t count)
|
|
|
|
{
|
|
|
|
if (ppc_md.cpu_probe)
|
|
|
|
return ppc_md.cpu_probe(buf, count);
|
|
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ssize_t arch_cpu_release(const char *buf, size_t count)
|
|
|
|
{
|
|
|
|
if (ppc_md.cpu_release)
|
|
|
|
return ppc_md.cpu_release(buf, count);
|
|
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
#endif /* CONFIG_HOTPLUG_CPU */
|
|
|
|
|
2006-07-30 10:03:35 +00:00
|
|
|
static int __cpuinit sysfs_cpu_notify(struct notifier_block *self,
|
2005-04-16 22:20:36 +00:00
|
|
|
unsigned long action, void *hcpu)
|
|
|
|
{
|
|
|
|
unsigned int cpu = (unsigned int)(long)hcpu;
|
|
|
|
|
|
|
|
switch (action) {
|
|
|
|
case CPU_ONLINE:
|
2007-05-09 09:35:10 +00:00
|
|
|
case CPU_ONLINE_FROZEN:
|
2005-04-16 22:20:36 +00:00
|
|
|
register_cpu_online(cpu);
|
|
|
|
break;
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
case CPU_DEAD:
|
2007-05-09 09:35:10 +00:00
|
|
|
case CPU_DEAD_FROZEN:
|
2005-04-16 22:20:36 +00:00
|
|
|
unregister_cpu_online(cpu);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
return NOTIFY_OK;
|
|
|
|
}
|
|
|
|
|
2006-07-30 10:03:35 +00:00
|
|
|
static struct notifier_block __cpuinitdata sysfs_cpu_nb = {
|
2005-04-16 22:20:36 +00:00
|
|
|
.notifier_call = sysfs_cpu_notify,
|
|
|
|
};
|
|
|
|
|
2006-10-24 16:31:24 +00:00
|
|
|
static DEFINE_MUTEX(cpu_mutex);
|
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
int cpu_add_dev_attr(struct device_attribute *attr)
|
2006-10-24 16:31:24 +00:00
|
|
|
{
|
|
|
|
int cpu;
|
|
|
|
|
|
|
|
mutex_lock(&cpu_mutex);
|
|
|
|
|
|
|
|
for_each_possible_cpu(cpu) {
|
2011-12-21 22:29:42 +00:00
|
|
|
device_create_file(get_cpu_device(cpu), attr);
|
2006-10-24 16:31:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&cpu_mutex);
|
|
|
|
return 0;
|
|
|
|
}
|
2011-12-21 22:29:42 +00:00
|
|
|
EXPORT_SYMBOL_GPL(cpu_add_dev_attr);
|
2006-10-24 16:31:24 +00:00
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
int cpu_add_dev_attr_group(struct attribute_group *attrs)
|
2006-10-24 16:31:24 +00:00
|
|
|
{
|
|
|
|
int cpu;
|
2011-12-21 22:29:42 +00:00
|
|
|
struct device *dev;
|
2007-09-05 02:43:17 +00:00
|
|
|
int ret;
|
2006-10-24 16:31:24 +00:00
|
|
|
|
|
|
|
mutex_lock(&cpu_mutex);
|
|
|
|
|
|
|
|
for_each_possible_cpu(cpu) {
|
2011-12-21 22:29:42 +00:00
|
|
|
dev = get_cpu_device(cpu);
|
|
|
|
ret = sysfs_create_group(&dev->kobj, attrs);
|
2007-09-05 02:43:17 +00:00
|
|
|
WARN_ON(ret != 0);
|
2006-10-24 16:31:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&cpu_mutex);
|
|
|
|
return 0;
|
|
|
|
}
|
2011-12-21 22:29:42 +00:00
|
|
|
EXPORT_SYMBOL_GPL(cpu_add_dev_attr_group);
|
2006-10-24 16:31:24 +00:00
|
|
|
|
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
void cpu_remove_dev_attr(struct device_attribute *attr)
|
2006-10-24 16:31:24 +00:00
|
|
|
{
|
|
|
|
int cpu;
|
|
|
|
|
|
|
|
mutex_lock(&cpu_mutex);
|
|
|
|
|
|
|
|
for_each_possible_cpu(cpu) {
|
2011-12-21 22:29:42 +00:00
|
|
|
device_remove_file(get_cpu_device(cpu), attr);
|
2006-10-24 16:31:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&cpu_mutex);
|
|
|
|
}
|
2011-12-21 22:29:42 +00:00
|
|
|
EXPORT_SYMBOL_GPL(cpu_remove_dev_attr);
|
2006-10-24 16:31:24 +00:00
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
void cpu_remove_dev_attr_group(struct attribute_group *attrs)
|
2006-10-24 16:31:24 +00:00
|
|
|
{
|
|
|
|
int cpu;
|
2011-12-21 22:29:42 +00:00
|
|
|
struct device *dev;
|
2006-10-24 16:31:24 +00:00
|
|
|
|
|
|
|
mutex_lock(&cpu_mutex);
|
|
|
|
|
|
|
|
for_each_possible_cpu(cpu) {
|
2011-12-21 22:29:42 +00:00
|
|
|
dev = get_cpu_device(cpu);
|
|
|
|
sysfs_remove_group(&dev->kobj, attrs);
|
2006-10-24 16:31:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&cpu_mutex);
|
|
|
|
}
|
2011-12-21 22:29:42 +00:00
|
|
|
EXPORT_SYMBOL_GPL(cpu_remove_dev_attr_group);
|
2006-10-24 16:31:24 +00:00
|
|
|
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* NUMA stuff */
|
|
|
|
|
|
|
|
#ifdef CONFIG_NUMA
|
|
|
|
static void register_nodes(void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2006-06-27 09:53:38 +00:00
|
|
|
for (i = 0; i < MAX_NUMNODES; i++)
|
|
|
|
register_one_node(i);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2006-05-01 19:16:12 +00:00
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
int sysfs_add_device_to_node(struct device *dev, int nid)
|
2006-05-01 19:16:12 +00:00
|
|
|
{
|
|
|
|
struct node *node = &node_devices[nid];
|
2011-12-21 22:48:43 +00:00
|
|
|
return sysfs_create_link(&node->dev.kobj, &dev->kobj,
|
2006-05-01 19:16:12 +00:00
|
|
|
kobject_name(&dev->kobj));
|
|
|
|
}
|
2007-07-05 09:35:33 +00:00
|
|
|
EXPORT_SYMBOL_GPL(sysfs_add_device_to_node);
|
2006-05-01 19:16:12 +00:00
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
void sysfs_remove_device_from_node(struct device *dev, int nid)
|
2006-05-01 19:16:12 +00:00
|
|
|
{
|
|
|
|
struct node *node = &node_devices[nid];
|
2011-12-21 22:48:43 +00:00
|
|
|
sysfs_remove_link(&node->dev.kobj, kobject_name(&dev->kobj));
|
2006-05-01 19:16:12 +00:00
|
|
|
}
|
2007-07-05 09:35:33 +00:00
|
|
|
EXPORT_SYMBOL_GPL(sysfs_remove_device_from_node);
|
2006-05-01 19:16:12 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
#else
|
|
|
|
static void register_nodes(void)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2006-05-01 19:16:12 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Only valid if CPU is present. */
|
2011-12-21 22:29:42 +00:00
|
|
|
static ssize_t show_physical_id(struct device *dev,
|
|
|
|
struct device_attribute *attr, char *buf)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2011-12-21 22:29:42 +00:00
|
|
|
struct cpu *cpu = container_of(dev, struct cpu, dev);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
return sprintf(buf, "%d\n", get_hard_smp_processor_id(cpu->dev.id));
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2011-12-21 22:29:42 +00:00
|
|
|
static DEVICE_ATTR(physical_id, 0444, show_physical_id, NULL);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
static int __init topology_init(void)
|
|
|
|
{
|
|
|
|
int cpu;
|
|
|
|
|
|
|
|
register_nodes();
|
|
|
|
register_cpu_notifier(&sysfs_cpu_nb);
|
|
|
|
|
2006-03-28 22:50:51 +00:00
|
|
|
for_each_possible_cpu(cpu) {
|
2005-04-16 22:20:36 +00: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-07 01:14:10 +00:00
|
|
|
if (ppc_md.cpu_die)
|
|
|
|
c->hotpluggable = 1;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-12-07 01:14:10 +00: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 09:53:41 +00:00
|
|
|
register_cpu(c, cpu);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2011-12-21 22:29:42 +00:00
|
|
|
device_create_file(&c->dev, &dev_attr_physical_id);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (cpu_online(cpu))
|
|
|
|
register_cpu_online(cpu);
|
|
|
|
}
|
2011-03-02 15:18:48 +00:00
|
|
|
#ifdef CONFIG_PPC64
|
|
|
|
sysfs_create_dscr_default();
|
|
|
|
#endif /* CONFIG_PPC64 */
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2007-05-02 17:11:49 +00:00
|
|
|
subsys_initcall(topology_init);
|