Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ba22b16 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc32: move smp ipi to method ops 



I ended up renaming set_cpu_int to send_ipi to
be consistent all way around.
send_ipi was moved to the *_smp.c files so
we could call the relevant method direct,
without any _ops indirection.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c68e5d39

arch/sparc/include/asm/obio.h

+0 −13
Original line number Diff line number Diff line
@@ -220,19 +220,6 @@ static inline void cc_set_igen(unsigned gen) 
			      "i" (ASI_M_MXCC));

}



/* +-------+-------------+-----------+------------------------------------+

 * | bcast |  devid      |   sid     |              levels mask           |

 * +-------+-------------+-----------+------------------------------------+

 *  31      30         23 22       15 14                                 0

 */

#define IGEN_MESSAGE(bcast, devid, sid, levels) \

	(((bcast) << 31) | ((devid) << 23) | ((sid) << 15) | (levels))

            

static inline void sun4d_send_ipi(int cpu, int level)

{

	cc_set_igen(IGEN_MESSAGE(0, cpu << 3, 6 + ((level >> 1) & 7), 1 << (level - 1)));

}



#endif /* !__ASSEMBLY__ */



#endif /* !(_SPARC_OBIO_H) */

arch/sparc/include/asm/smp_32.h

+32 −13
Original line number Diff line number Diff line
@@ -58,24 +58,43 @@ struct seq_file; 
void smp_bogo(struct seq_file *);

void smp_info(struct seq_file *);



BTFIXUPDEF_CALL(void, smp_cross_call, smpfunc_t, cpumask_t, unsigned long, unsigned long, unsigned long, unsigned long)

BTFIXUPDEF_CALL(void, smp_ipi_resched, int);

BTFIXUPDEF_CALL(void, smp_ipi_single, int);

BTFIXUPDEF_CALL(void, smp_ipi_mask_one, int);



#define smp_cross_call(func,mask,arg1,arg2,arg3,arg4) BTFIXUP_CALL(smp_cross_call)(func,mask,arg1,arg2,arg3,arg4)

struct sparc32_ipi_ops {

	void (*cross_call)(smpfunc_t func, cpumask_t mask, unsigned long arg1,

			   unsigned long arg2, unsigned long arg3,

			   unsigned long arg4);

	void (*resched)(int cpu);

	void (*single)(int cpu);

	void (*mask_one)(int cpu);

};

extern const struct sparc32_ipi_ops *sparc32_ipi_ops;



static inline void xc0(smpfunc_t func)

{

	sparc32_ipi_ops->cross_call(func, *cpu_online_mask, 0, 0, 0, 0);

}



static inline void xc0(smpfunc_t func) { smp_cross_call(func, *cpu_online_mask, 0, 0, 0, 0); }

static inline void xc1(smpfunc_t func, unsigned long arg1)

{ smp_cross_call(func, *cpu_online_mask, arg1, 0, 0, 0); }

{

	sparc32_ipi_ops->cross_call(func, *cpu_online_mask, arg1, 0, 0, 0);

}

static inline void xc2(smpfunc_t func, unsigned long arg1, unsigned long arg2)

{ smp_cross_call(func, *cpu_online_mask, arg1, arg2, 0, 0); }

{

	sparc32_ipi_ops->cross_call(func, *cpu_online_mask, arg1, arg2, 0, 0);

}



static inline void xc3(smpfunc_t func, unsigned long arg1, unsigned long arg2,

		       unsigned long arg3)

{ smp_cross_call(func, *cpu_online_mask, arg1, arg2, arg3, 0); }

{

	sparc32_ipi_ops->cross_call(func, *cpu_online_mask,

				    arg1, arg2, arg3, 0);

}



static inline void xc4(smpfunc_t func, unsigned long arg1, unsigned long arg2,

		       unsigned long arg3, unsigned long arg4)

{ smp_cross_call(func, *cpu_online_mask, arg1, arg2, arg3, arg4); }

{

	sparc32_ipi_ops->cross_call(func, *cpu_online_mask,

				    arg1, arg2, arg3, arg4);

}



extern void arch_send_call_function_single_ipi(int cpu);

extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);

arch/sparc/kernel/irq.h

+5 −3
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ struct irq_bucket { 
        unsigned int pil;

};



#define SUN4M_HARD_INT(x)       (0x000000001 << (x))

#define SUN4M_SOFT_INT(x)       (0x000010000 << (x))



#define SUN4D_MAX_BOARD 10

#define SUN4D_MAX_IRQ ((SUN4D_MAX_BOARD + 2) << 5)
@@ -96,10 +99,9 @@ static inline void load_profile_irq(int cpu, int limit) 
	BTFIXUP_CALL(load_profile_irq)(cpu, limit);

}



#ifdef CONFIG_SMP

BTFIXUPDEF_CALL(void, set_cpu_int, int, int)

unsigned long leon_get_irqmask(unsigned int irq);



#define set_cpu_int(cpu,level) BTFIXUP_CALL(set_cpu_int)(cpu,level)

#ifdef CONFIG_SMP



/* All SUN4D IPIs are sent on this IRQ, may be shared with hard IRQs */

#define SUN4D_IPI_IRQ 13

arch/sparc/kernel/leon_kernel.c

+3 −16
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void leon_eirq_setup(unsigned int eirq) 
	sparc_leon_eirq = eirq;

}



static inline unsigned long get_irqmask(unsigned int irq)

unsigned long leon_get_irqmask(unsigned int irq)

{

	unsigned long mask;
@@ -212,7 +212,7 @@ unsigned int leon_build_device_irq(unsigned int real_irq, 
	unsigned long mask;



	irq = 0;

	mask = get_irqmask(real_irq);

	mask = leon_get_irqmask(real_irq);

	if (mask == 0)

		goto out;
@@ -497,14 +497,6 @@ void __init leon_node_init(struct device_node *dp, struct device_node ***nextp) 
}



#ifdef CONFIG_SMP



void leon_set_cpu_int(int cpu, int level)

{

	unsigned long mask;

	mask = get_irqmask(level);

	LEON3_BYPASS_STORE_PA(&leon3_irqctrl_regs->force[cpu], mask);

}



void leon_clear_profile_irq(int cpu)

{

}
@@ -512,7 +504,7 @@ void leon_clear_profile_irq(int cpu) 
void leon_enable_irq_cpu(unsigned int irq_nr, unsigned int cpu)

{

	unsigned long mask, flags, *addr;

	mask = get_irqmask(irq_nr);

	mask = leon_get_irqmask(irq_nr);

	spin_lock_irqsave(&leon_irq_lock, flags);

	addr = (unsigned long *)LEON_IMASK(cpu);

	LEON3_BYPASS_STORE_PA(addr, (LEON3_BYPASS_LOAD_PA(addr) | mask));
@@ -531,11 +523,6 @@ void __init leon_init_IRQ(void) 
			BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(load_profile_irq, leon_load_profile_irq,

			BTFIXUPCALL_NOP);



#ifdef CONFIG_SMP

	BTFIXUPSET_CALL(set_cpu_int, leon_set_cpu_int, BTFIXUPCALL_NORM);

#endif



}



void __init leon_init(void)

arch/sparc/kernel/leon_smp.c

+19 −8
Original line number Diff line number Diff line
@@ -346,6 +346,13 @@ static void __init leon_ipi_init(void) 
	}

}



static void leon_send_ipi(int cpu, int level)

{

	unsigned long mask;

	mask = leon_get_irqmask(level);

	LEON3_BYPASS_STORE_PA(&leon3_irqctrl_regs->force[cpu], mask);

}



static void leon_ipi_single(int cpu)

{

	struct leon_ipi_work *work = &per_cpu(leon_ipi_work, cpu);
@@ -354,7 +361,7 @@ static void leon_ipi_single(int cpu) 
	work->single = 1;



	/* Generate IRQ on the CPU */

	set_cpu_int(cpu, leon_ipi_irq);

	leon_send_ipi(cpu, leon_ipi_irq);

}



static void leon_ipi_mask_one(int cpu)
@@ -365,7 +372,7 @@ static void leon_ipi_mask_one(int cpu) 
	work->msk = 1;



	/* Generate IRQ on the CPU */

	set_cpu_int(cpu, leon_ipi_irq);

	leon_send_ipi(cpu, leon_ipi_irq);

}



static void leon_ipi_resched(int cpu)
@@ -376,7 +383,7 @@ static void leon_ipi_resched(int cpu) 
	work->resched = 1;



	/* Generate IRQ on the CPU (any IRQ will cause resched) */

	set_cpu_int(cpu, leon_ipi_irq);

	leon_send_ipi(cpu, leon_ipi_irq);

}



void leonsmp_ipi_interrupt(void)
@@ -448,7 +455,7 @@ static void leon_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1, 
				if (cpumask_test_cpu(i, &mask)) {

					ccall_info.processors_in[i] = 0;

					ccall_info.processors_out[i] = 0;

					set_cpu_int(i, LEON3_IRQ_CROSS_CALL);

					leon_send_ipi(i, LEON3_IRQ_CROSS_CALL);



				}

			}
@@ -491,15 +498,19 @@ void leon_cross_call_irq(void) 
	ccall_info.processors_out[i] = 1;

}



static const struct sparc32_ipi_ops leon_ipi_ops = {

	.cross_call = leon_cross_call,

	.resched    = leon_ipi_resched,

	.single     = leon_ipi_single,

	.mask_one   = leon_ipi_mask_one,

};



void __init leon_init_smp(void)

{

	/* Patch ipi15 trap table */

	t_nmi[1] = t_nmi[1] + (linux_trap_ipi15_leon - linux_trap_ipi15_sun4m);



	BTFIXUPSET_CALL(smp_cross_call, leon_cross_call, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(smp_ipi_resched, leon_ipi_resched, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(smp_ipi_single, leon_ipi_single, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(smp_ipi_mask_one, leon_ipi_mask_one, BTFIXUPCALL_NORM);

	sparc32_ipi_ops = &leon_ipi_ops;

}



#endif /* CONFIG_SPARC_LEON */