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

Commit e962bb9e authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

microblaze: Use generic idle loop 



The microblaze idle loop provides a polling and a non polling version,
which are suprisingly both polling, just with slightly different
instrumentation. Remove them and use the generic poller.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Paul McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Reviewed-by: default avatarCc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Michal Simek <monstr@monstr.eu>
Link: http://lkml.kernel.org/r/20130321215234.687590459@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d1dba0fc

arch/microblaze/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ config MICROBLAZE 
	select GENERIC_CPU_DEVICES

	select GENERIC_ATOMIC64

	select GENERIC_CLOCKEVENTS

	select GENERIC_IDLE_LOOP

	select GENERIC_IDLE_POLL_SETUP

	select MODULES_USE_ELF_RELA

	select CLONE_BACKWARDS

arch/microblaze/include/asm/processor.h

+0 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
extern const struct seq_operations cpuinfo_op;



# define cpu_relax()		barrier()

# define cpu_sleep()		do {} while (0)



#define task_pt_regs(tsk) \

		(((struct pt_regs *)(THREAD_SIZE + task_stack_page(tsk))) - 1)
@@ -160,8 +159,6 @@ unsigned long get_wchan(struct task_struct *p); 
#  define STACK_TOP	TASK_SIZE

#  define STACK_TOP_MAX	STACK_TOP



void default_idle(void);



#ifdef CONFIG_DEBUG_FS

extern struct dentry *of_debugfs_root;

#endif

arch/microblaze/kernel/process.c

+0 −53
Original line number Diff line number Diff line
@@ -44,59 +44,6 @@ void show_regs(struct pt_regs *regs) 
void (*pm_power_off)(void) = NULL;

EXPORT_SYMBOL(pm_power_off);



static int hlt_counter = 1;



static int __init nohlt_setup(char *__unused)

{

	hlt_counter = 1;

	return 1;

}

__setup("nohlt", nohlt_setup);



static int __init hlt_setup(char *__unused)

{

	hlt_counter = 0;

	return 1;

}

__setup("hlt", hlt_setup);



void default_idle(void)

{

	if (likely(hlt_counter)) {

		local_irq_disable();

		stop_critical_timings();

		cpu_relax();

		start_critical_timings();

		local_irq_enable();

	} else {

		clear_thread_flag(TIF_POLLING_NRFLAG);

		smp_mb__after_clear_bit();

		local_irq_disable();

		while (!need_resched())

			cpu_sleep();

		local_irq_enable();

		set_thread_flag(TIF_POLLING_NRFLAG);

	}

}



void cpu_idle(void)

{

	set_thread_flag(TIF_POLLING_NRFLAG);



	/* endless idle loop with no priority at all */

	while (1) {

		tick_nohz_idle_enter();

		rcu_idle_enter();

		while (!need_resched())

			default_idle();

		rcu_idle_exit();

		tick_nohz_idle_exit();



		schedule_preempt_disabled();

		check_pgt_cache();

	}

}



void flush_thread(void)

{

}