redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

powerpc: Remove checks for MSG_ALL and MSG_ALL_BUT_SELF 

Now that smp_ops->smp_message_pass is always called with an (online) cpu
number for the target remove the checks for MSG_ALL and MSG_ALL_BUT_SELF.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
hifive-unleashed-5.1
Milton Miller 2011-05-10 19:29:10 +00:00 committed by Benjamin Herrenschmidt
parent e047637132
commit f1072939b6
12 changed files with 20 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/include/asm/dbell.h
View File

@ -27,7 +27,7 @@ enum ppc_dbell {
PPC_G_DBELL_MC = 4, /* guest mcheck doorbell */
};
extern void doorbell_message_pass(int target, int msg);
extern void doorbell_message_pass(int cpu, int msg);
extern void doorbell_exception(struct pt_regs *regs);
extern void doorbell_check_self(void);
extern void doorbell_setup_this_cpu(void);

2
arch/powerpc/include/asm/machdep.h
View File

@ -31,7 +31,7 @@ struct kimage;
#ifdef CONFIG_SMP
struct smp_ops_t {
void (*message_pass)(int target, int msg);
void (*message_pass)(int cpu, int msg);
int (*probe)(void);
int (*kick_cpu)(int nr);
void (*setup_cpu)(int nr);

2
arch/powerpc/include/asm/xics.h
View File

@ -40,7 +40,7 @@ struct icp_ops {
void (*teardown_cpu)(void);
void (*flush_ipi)(void);
#ifdef CONFIG_SMP
void (*message_pass)(int target, int msg);
void (*message_pass)(int cpu, int msg);
irq_handler_t ipi_action;
#endif
};

27
arch/powerpc/kernel/dbell.c
View File

@ -34,32 +34,13 @@ void doorbell_setup_this_cpu(void)
info->tag = mfspr(SPRN_PIR) & 0x3fff;
}
void doorbell_message_pass(int target, int msg)
void doorbell_message_pass(int cpu, int msg)
{
struct doorbell_cpu_info *info;
int i;
if (target < NR_CPUS) {
info = &per_cpu(doorbell_cpu_info, target);
set_bit(msg, &info->messages);
ppc_msgsnd(PPC_DBELL, 0, info->tag);
}
else if (target == MSG_ALL_BUT_SELF) {
for_each_online_cpu(i) {
if (i == smp_processor_id())
continue;
info = &per_cpu(doorbell_cpu_info, i);
set_bit(msg, &info->messages);
ppc_msgsnd(PPC_DBELL, 0, info->tag);
}
}
else { /* target == MSG_ALL */
for_each_online_cpu(i) {
info = &per_cpu(doorbell_cpu_info, i);
set_bit(msg, &info->messages);
}
ppc_msgsnd(PPC_DBELL, PPC_DBELL_MSG_BRDCAST, 0);
}
info = &per_cpu(doorbell_cpu_info, cpu);
set_bit(msg, &info->messages);
ppc_msgsnd(PPC_DBELL, 0, info->tag);
}
void doorbell_exception(struct pt_regs *regs)

18
arch/powerpc/platforms/cell/beat_smp.c
View File

@ -67,22 +67,6 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
return 0;
}
static void smp_beatic_message_pass(int target, int msg)
{
unsigned int i;
if (target < NR_CPUS) {
beatic_cause_IPI(target, msg);
} else {
for_each_online_cpu(i) {
if (target == MSG_ALL_BUT_SELF
&& i == smp_processor_id())
continue;
beatic_cause_IPI(i, msg);
}
}
}
static int __init smp_beatic_probe(void)
{
return cpumask_weight(cpu_possible_mask);
@ -105,7 +89,7 @@ static int smp_celleb_cpu_bootable(unsigned int nr)
return 1;
}
static struct smp_ops_t bpa_beatic_smp_ops = {
.message_pass = smp_beatic_message_pass,
.message_pass = beatic_cause_IPI,
.probe = smp_beatic_probe,
.kick_cpu = smp_celleb_kick_cpu,
.setup_cpu = smp_beatic_setup_cpu,

18
arch/powerpc/platforms/cell/smp.c
View File

@ -103,22 +103,6 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
return 1;
}
static void smp_iic_message_pass(int target, int msg)
{
unsigned int i;
if (target < NR_CPUS) {
iic_cause_IPI(target, msg);
} else {
for_each_online_cpu(i) {
if (target == MSG_ALL_BUT_SELF
&& i == smp_processor_id())
continue;
iic_cause_IPI(i, msg);
}
}
}
static int __init smp_iic_probe(void)
{
iic_request_IPIs();
@ -168,7 +152,7 @@ static int smp_cell_cpu_bootable(unsigned int nr)
return 1;
}
static struct smp_ops_t bpa_iic_smp_ops = {
.message_pass = smp_iic_message_pass,
.message_pass = iic_cause_IPI,
.probe = smp_iic_probe,
.kick_cpu = smp_cell_kick_cpu,
.setup_cpu = smp_cell_setup_cpu,

18
arch/powerpc/platforms/iseries/smp.c
View File

@ -59,28 +59,12 @@ void iSeries_smp_message_recv(void)
smp_message_recv(msg);
}
static inline void smp_iSeries_do_message(int cpu, int msg)
static void smp_iSeries_message_pass(int cpu, int msg)
{
set_bit(msg, &iSeries_smp_message[cpu]);
HvCall_sendIPI(&(paca[cpu]));
}
static void smp_iSeries_message_pass(int target, int msg)
{
int i;
if (target < NR_CPUS)
smp_iSeries_do_message(target, msg);
else {
for_each_online_cpu(i) {
if ((target == MSG_ALL_BUT_SELF) &&
(i == smp_processor_id()))
continue;
smp_iSeries_do_message(i, msg);
}
}
}
static int smp_iSeries_probe(void)
{
return cpumask_weight(cpu_possible_mask);

17
arch/powerpc/platforms/powermac/smp.c
View File

@ -186,21 +186,10 @@ irqreturn_t psurge_primary_intr(int irq, void *d)
return IRQ_HANDLED;
}
static void smp_psurge_message_pass(int target, int msg)
static void smp_psurge_message_pass(int cpu, int msg)
{
int i;
if (num_online_cpus() < 2)
return;
for_each_online_cpu(i) {
if (target == MSG_ALL
|| (target == MSG_ALL_BUT_SELF && i != smp_processor_id())
|| target == i) {
set_bit(msg, &psurge_smp_message[i]);
psurge_set_ipi(i);
}
}
set_bit(msg, &psurge_smp_message[cpu]);
psurge_set_ipi(cpu);
}
/*

22
arch/powerpc/platforms/ps3/smp.c
View File

@ -39,7 +39,7 @@
#define MSG_COUNT 4
static DEFINE_PER_CPU(unsigned int [MSG_COUNT], ps3_ipi_virqs);
static void do_message_pass(int target, int msg)
static void ps3_smp_message_pass(int cpu, int msg)
{
int result;
unsigned int virq;
@ -49,28 +49,12 @@ static void do_message_pass(int target, int msg)
return;
}
virq = per_cpu(ps3_ipi_virqs, target)[msg];
virq = per_cpu(ps3_ipi_virqs, cpu)[msg];
result = ps3_send_event_locally(virq);
if (result)
DBG("%s:%d: ps3_send_event_locally(%d, %d) failed"
" (%d)\n", __func__, __LINE__, target, msg, result);
}
static void ps3_smp_message_pass(int target, int msg)
{
int cpu;
if (target < NR_CPUS)
do_message_pass(target, msg);
else if (target == MSG_ALL_BUT_SELF) {
for_each_online_cpu(cpu)
if (cpu != smp_processor_id())
do_message_pass(cpu, msg);
} else {
for_each_online_cpu(cpu)
do_message_pass(cpu, msg);
}
" (%d)\n", __func__, __LINE__, cpu, msg, result);
}
static int ps3_smp_probe(void)

20
arch/powerpc/sysdev/mpic.c
View File

@ -1628,31 +1628,15 @@ static void mpic_send_ipi(unsigned int ipi_no, const struct cpumask *cpu_mask)
mpic_physmask(cpumask_bits(cpu_mask)[0]));
}
void smp_mpic_message_pass(int target, int msg)
void smp_mpic_message_pass(int cpu, int msg)
{
cpumask_var_t tmp;
/* make sure we're sending something that translates to an IPI */
if ((unsigned int)msg > 3) {
printk("SMP %d: smp_message_pass: unknown msg %d\n",
smp_processor_id(), msg);
return;
}
switch (target) {
case MSG_ALL:
mpic_send_ipi(msg, cpu_online_mask);
break;
case MSG_ALL_BUT_SELF:
alloc_cpumask_var(&tmp, GFP_NOWAIT);
cpumask_andnot(tmp, cpu_online_mask,
cpumask_of(smp_processor_id()));
mpic_send_ipi(msg, tmp);
free_cpumask_var(tmp);
break;
default:
mpic_send_ipi(msg, cpumask_of(target));
break;
}
mpic_send_ipi(msg, cpumask_of(cpu));
}
int __init smp_mpic_probe(void)

18
arch/powerpc/sysdev/xics/icp-hv.c
View File

@ -118,7 +118,7 @@ static void icp_hv_set_cpu_priority(unsigned char cppr)
#ifdef CONFIG_SMP
static inline void icp_hv_do_message(int cpu, int msg)
static void icp_hv_message_pass(int cpu, int msg)
{
unsigned long *tgt = &per_cpu(xics_ipi_message, cpu);
@ -127,22 +127,6 @@ static inline void icp_hv_do_message(int cpu, int msg)
icp_hv_set_qirr(cpu, IPI_PRIORITY);
}
static void icp_hv_message_pass(int target, int msg)
{
unsigned int i;
if (target < NR_CPUS) {
icp_hv_do_message(target, msg);
} else {
for_each_online_cpu(i) {
if (target == MSG_ALL_BUT_SELF
&& i == smp_processor_id())
continue;
icp_hv_do_message(i, msg);
}
}
}
static irqreturn_t icp_hv_ipi_action(int irq, void *dev_id)
{
int cpu = smp_processor_id();

18
arch/powerpc/sysdev/xics/icp-native.c
View File

@ -134,7 +134,7 @@ static unsigned int icp_native_get_irq(void)
#ifdef CONFIG_SMP
static inline void icp_native_do_message(int cpu, int msg)
static void icp_native_message_pass(int cpu, int msg)
{
unsigned long *tgt = &per_cpu(xics_ipi_message, cpu);
@ -143,22 +143,6 @@ static inline void icp_native_do_message(int cpu, int msg)
icp_native_set_qirr(cpu, IPI_PRIORITY);
}
static void icp_native_message_pass(int target, int msg)
{
unsigned int i;
if (target < NR_CPUS) {
icp_native_do_message(target, msg);
} else {
for_each_online_cpu(i) {
if (target == MSG_ALL_BUT_SELF
&& i == smp_processor_id())
continue;
icp_native_do_message(i, msg);
}
}
}
static irqreturn_t icp_native_ipi_action(int irq, void *dev_id)
{
int cpu = smp_processor_id();