leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MIPS: CMP: Update sync-r4k for current kernel

Browse Source 
This revises the sync-4k so it will boot and operate since the removal of
expirelo from the timer code.

Signed-off-by: Tim Anderson <tanderson@mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Tim Anderson 2009-06-17 16:40:34 -07:00 committed by Ralf Baechle
parent 47b178bb69
commit eb9b5141a9
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/Kconfig
View File

@ -1656,7 +1656,7 @@ config MIPS_APSP_KSPD
config MIPS_CMP config MIPS_CMP
bool "MIPS CMP framework support" bool "MIPS CMP framework support"
depends on SYS_SUPPORTS_MIPS_CMP depends on SYS_SUPPORTS_MIPS_CMP
select SYNC_R4K if BROKEN select SYNC_R4K
select SYS_SUPPORTS_SMP select SYS_SUPPORTS_SMP
select SYS_SUPPORTS_SCHED_SMT if SMP select SYS_SUPPORTS_SCHED_SMT if SMP
select WEAK_ORDERING select WEAK_ORDERING

29
arch/mips/kernel/sync-r4k.c
View File

@ -1,7 +1,7 @@
/* /*
* Count register synchronisation. * Count register synchronisation.
* *
* All CPUs will have their count registers synchronised to the CPU0 expirelo * All CPUs will have their count registers synchronised to the CPU0 next time
* value. This can cause a small timewarp for CPU0. All other CPU's should * value. This can cause a small timewarp for CPU0. All other CPU's should
* not have done anything significant (but they may have had interrupts * not have done anything significant (but they may have had interrupts
* enabled briefly - prom_smp_finish() should not be responsible for enabling * enabled briefly - prom_smp_finish() should not be responsible for enabling
@ -13,21 +13,22 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/irqflags.h> #include <linux/irqflags.h>
#include <linux/r4k-timer.h> #include <linux/cpumask.h>
#include <asm/r4k-timer.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/barrier.h> #include <asm/barrier.h>
#include <asm/cpumask.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
static atomic_t __initdata count_start_flag = ATOMIC_INIT(0); static atomic_t __cpuinitdata count_start_flag = ATOMIC_INIT(0);
static atomic_t __initdata count_count_start = ATOMIC_INIT(0); static atomic_t __cpuinitdata count_count_start = ATOMIC_INIT(0);
static atomic_t __initdata count_count_stop = ATOMIC_INIT(0); static atomic_t __cpuinitdata count_count_stop = ATOMIC_INIT(0);
static atomic_t __cpuinitdata count_reference = ATOMIC_INIT(0);
#define COUNTON 100 #define COUNTON 100
#define NR_LOOPS 5 #define NR_LOOPS 5
void __init synchronise_count_master(void) void __cpuinit synchronise_count_master(void)
{ {
int i; int i;
unsigned long flags; unsigned long flags;
@ -42,7 +43,7 @@ void __init synchronise_count_master(void)
return; return;
#endif #endif
pr_info("Checking COUNT synchronization across %u CPUs: ", printk(KERN_INFO "Synchronize counters across %u CPUs: ",
num_online_cpus()); num_online_cpus());
local_irq_save(flags); local_irq_save(flags);
@ -50,11 +51,12 @@ void __init synchronise_count_master(void)
/* /*
* Notify the slaves that it's time to start * Notify the slaves that it's time to start
*/ */
atomic_set(&count_reference, read_c0_count());
atomic_set(&count_start_flag, 1); atomic_set(&count_start_flag, 1);
smp_wmb(); smp_wmb();
/* Count will be initialised to expirelo for all CPU's */ /* Count will be initialised to current timer for all CPU's */
initcount = expirelo; initcount = read_c0_count();
/* /*
* We loop a few times to get a primed instruction cache, * We loop a few times to get a primed instruction cache,
@ -106,7 +108,7 @@ void __init synchronise_count_master(void)
printk("done.\n"); printk("done.\n");
} }
void __init synchronise_count_slave(void) void __cpuinit synchronise_count_slave(void)
{ {
int i; int i;
unsigned long flags; unsigned long flags;
@ -131,8 +133,8 @@ void __init synchronise_count_slave(void)
while (!atomic_read(&count_start_flag)) while (!atomic_read(&count_start_flag))
mb(); mb();
/* Count will be initialised to expirelo for all CPU's */ /* Count will be initialised to next expire for all CPU's */
initcount = expirelo; initcount = atomic_read(&count_reference);
ncpus = num_online_cpus(); ncpus = num_online_cpus();
for (i = 0; i < NR_LOOPS; i++) { for (i = 0; i < NR_LOOPS; i++) {
@ -156,4 +158,3 @@ void __init synchronise_count_slave(void)
local_irq_restore(flags); local_irq_restore(flags);
} }
#undef NR_LOOPS #undef NR_LOOPS
#endif