cf9bfe55f2
The current implementation of synchronise_count_{master,slave} blocks
slave CPUs in early boot until all of them come up. This no longer
works because blocking a CPU with interrupts off after notifying the
CPU to be online causes problems with the current kernel.
Specifically, after the workqueue changes
(commit a08489c569 "Pull workqueue changes from Tejun Heo")
the CPU_ONLINE notification callback workqueue_cpu_up_callback()
will hang on wait_for_completion(&idle_rebind.done), if the slave
CPUs are blocked for synchronize_count_slave().
The changes are to update synchronize_count_{master,slave}() to handle
one CPU at a time and to call synchronise_count_master() in __cpu_up()
so that the CPU_ONLINE notification goes out only after the COP0 COUNT
register is synchronized.
[ralf@linux-mips.org: This matter only to those few platforms which are
using the cp0 counter as their clocksource which are XLP, XLR and MIPS'
CMP solution.]
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/4216/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
152 lines
3.7 KiB
C
152 lines
3.7 KiB
C
/*
|
|
* Count register synchronisation.
|
|
*
|
|
* 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
|
|
* not have done anything significant (but they may have had interrupts
|
|
* enabled briefly - prom_smp_finish() should not be responsible for enabling
|
|
* interrupts...)
|
|
*
|
|
* FIXME: broken for SMTC
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/irqflags.h>
|
|
#include <linux/cpumask.h>
|
|
|
|
#include <asm/r4k-timer.h>
|
|
#include <linux/atomic.h>
|
|
#include <asm/barrier.h>
|
|
#include <asm/mipsregs.h>
|
|
|
|
static atomic_t __cpuinitdata count_start_flag = ATOMIC_INIT(0);
|
|
static atomic_t __cpuinitdata count_count_start = 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 NR_LOOPS 5
|
|
|
|
void __cpuinit synchronise_count_master(int cpu)
|
|
{
|
|
int i;
|
|
unsigned long flags;
|
|
unsigned int initcount;
|
|
|
|
#ifdef CONFIG_MIPS_MT_SMTC
|
|
/*
|
|
* SMTC needs to synchronise per VPE, not per CPU
|
|
* ignore for now
|
|
*/
|
|
return;
|
|
#endif
|
|
|
|
printk(KERN_INFO "Synchronize counters for CPU %u: ", cpu);
|
|
|
|
local_irq_save(flags);
|
|
|
|
/*
|
|
* Notify the slaves that it's time to start
|
|
*/
|
|
atomic_set(&count_reference, read_c0_count());
|
|
atomic_set(&count_start_flag, cpu);
|
|
smp_wmb();
|
|
|
|
/* Count will be initialised to current timer for all CPU's */
|
|
initcount = read_c0_count();
|
|
|
|
/*
|
|
* We loop a few times to get a primed instruction cache,
|
|
* then the last pass is more or less synchronised and
|
|
* the master and slaves each set their cycle counters to a known
|
|
* value all at once. This reduces the chance of having random offsets
|
|
* between the processors, and guarantees that the maximum
|
|
* delay between the cycle counters is never bigger than
|
|
* the latency of information-passing (cachelines) between
|
|
* two CPUs.
|
|
*/
|
|
|
|
for (i = 0; i < NR_LOOPS; i++) {
|
|
/* slaves loop on '!= 2' */
|
|
while (atomic_read(&count_count_start) != 1)
|
|
mb();
|
|
atomic_set(&count_count_stop, 0);
|
|
smp_wmb();
|
|
|
|
/* this lets the slaves write their count register */
|
|
atomic_inc(&count_count_start);
|
|
|
|
/*
|
|
* Everyone initialises count in the last loop:
|
|
*/
|
|
if (i == NR_LOOPS-1)
|
|
write_c0_count(initcount);
|
|
|
|
/*
|
|
* Wait for all slaves to leave the synchronization point:
|
|
*/
|
|
while (atomic_read(&count_count_stop) != 1)
|
|
mb();
|
|
atomic_set(&count_count_start, 0);
|
|
smp_wmb();
|
|
atomic_inc(&count_count_stop);
|
|
}
|
|
/* Arrange for an interrupt in a short while */
|
|
write_c0_compare(read_c0_count() + COUNTON);
|
|
atomic_set(&count_start_flag, 0);
|
|
|
|
local_irq_restore(flags);
|
|
|
|
/*
|
|
* i386 code reported the skew here, but the
|
|
* count registers were almost certainly out of sync
|
|
* so no point in alarming people
|
|
*/
|
|
printk("done.\n");
|
|
}
|
|
|
|
void __cpuinit synchronise_count_slave(int cpu)
|
|
{
|
|
int i;
|
|
unsigned int initcount;
|
|
|
|
#ifdef CONFIG_MIPS_MT_SMTC
|
|
/*
|
|
* SMTC needs to synchronise per VPE, not per CPU
|
|
* ignore for now
|
|
*/
|
|
return;
|
|
#endif
|
|
|
|
/*
|
|
* Not every cpu is online at the time this gets called,
|
|
* so we first wait for the master to say everyone is ready
|
|
*/
|
|
|
|
while (atomic_read(&count_start_flag) != cpu)
|
|
mb();
|
|
|
|
/* Count will be initialised to next expire for all CPU's */
|
|
initcount = atomic_read(&count_reference);
|
|
|
|
for (i = 0; i < NR_LOOPS; i++) {
|
|
atomic_inc(&count_count_start);
|
|
while (atomic_read(&count_count_start) != 2)
|
|
mb();
|
|
|
|
/*
|
|
* Everyone initialises count in the last loop:
|
|
*/
|
|
if (i == NR_LOOPS-1)
|
|
write_c0_count(initcount);
|
|
|
|
atomic_inc(&count_count_stop);
|
|
while (atomic_read(&count_count_stop) != 2)
|
|
mb();
|
|
}
|
|
/* Arrange for an interrupt in a short while */
|
|
write_c0_compare(read_c0_count() + COUNTON);
|
|
}
|
|
#undef NR_LOOPS
|