2008-11-19 15:35:56 +00:00
|
|
|
/*
|
|
|
|
* Author: Andy Fleming <afleming@freescale.com>
|
|
|
|
* Kumar Gala <galak@kernel.crashing.org>
|
|
|
|
*
|
2012-07-20 12:42:33 +00:00
|
|
|
* Copyright 2006-2008, 2011-2012 Freescale Semiconductor Inc.
|
2008-11-19 15:35:56 +00:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License as published by the
|
|
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
|
|
* option) any later version.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/stddef.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/of.h>
|
2013-11-11 05:19:08 +00:00
|
|
|
#include <linux/of_address.h>
|
2010-07-21 21:14:53 +00:00
|
|
|
#include <linux/kexec.h>
|
2010-09-16 22:58:26 +00:00
|
|
|
#include <linux/highmem.h>
|
2012-07-20 12:42:33 +00:00
|
|
|
#include <linux/cpu.h>
|
2008-11-19 15:35:56 +00:00
|
|
|
|
|
|
|
#include <asm/machdep.h>
|
|
|
|
#include <asm/pgtable.h>
|
|
|
|
#include <asm/page.h>
|
|
|
|
#include <asm/mpic.h>
|
|
|
|
#include <asm/cacheflush.h>
|
2009-02-12 04:50:42 +00:00
|
|
|
#include <asm/dbell.h>
|
2012-07-20 12:42:35 +00:00
|
|
|
#include <asm/fsl_guts.h>
|
2014-03-11 00:54:06 +00:00
|
|
|
#include <asm/code-patching.h>
|
2008-11-19 15:35:56 +00:00
|
|
|
|
|
|
|
#include <sysdev/fsl_soc.h>
|
2010-07-21 21:14:53 +00:00
|
|
|
#include <sysdev/mpic.h>
|
2011-12-02 06:27:58 +00:00
|
|
|
#include "smp.h"
|
2008-11-19 15:35:56 +00:00
|
|
|
|
2012-07-20 12:42:33 +00:00
|
|
|
struct epapr_spin_table {
|
|
|
|
u32 addr_h;
|
|
|
|
u32 addr_l;
|
|
|
|
u32 r3_h;
|
|
|
|
u32 r3_l;
|
|
|
|
u32 reserved;
|
|
|
|
u32 pir;
|
|
|
|
};
|
2008-11-19 15:35:56 +00:00
|
|
|
|
2012-07-20 12:42:35 +00:00
|
|
|
static struct ccsr_guts __iomem *guts;
|
|
|
|
static u64 timebase;
|
|
|
|
static int tb_req;
|
|
|
|
static int tb_valid;
|
|
|
|
|
|
|
|
static void mpc85xx_timebase_freeze(int freeze)
|
|
|
|
{
|
|
|
|
uint32_t mask;
|
|
|
|
|
|
|
|
mask = CCSR_GUTS_DEVDISR_TB0 | CCSR_GUTS_DEVDISR_TB1;
|
|
|
|
if (freeze)
|
|
|
|
setbits32(&guts->devdisr, mask);
|
|
|
|
else
|
|
|
|
clrbits32(&guts->devdisr, mask);
|
|
|
|
|
|
|
|
in_be32(&guts->devdisr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mpc85xx_give_timebase(void)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
local_irq_save(flags);
|
|
|
|
|
|
|
|
while (!tb_req)
|
|
|
|
barrier();
|
|
|
|
tb_req = 0;
|
|
|
|
|
|
|
|
mpc85xx_timebase_freeze(1);
|
2013-07-24 01:21:11 +00:00
|
|
|
#ifdef CONFIG_PPC64
|
|
|
|
/*
|
|
|
|
* e5500/e6500 have a workaround for erratum A-006958 in place
|
|
|
|
* that will reread the timebase until TBL is non-zero.
|
|
|
|
* That would be a bad thing when the timebase is frozen.
|
|
|
|
*
|
|
|
|
* Thus, we read it manually, and instead of checking that
|
|
|
|
* TBL is non-zero, we ensure that TB does not change. We don't
|
|
|
|
* do that for the main mftb implementation, because it requires
|
|
|
|
* a scratch register
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
u64 prev;
|
|
|
|
|
2013-08-21 00:33:12 +00:00
|
|
|
asm volatile("mfspr %0, %1" : "=r" (timebase) :
|
|
|
|
"i" (SPRN_TBRL));
|
2013-07-24 01:21:11 +00:00
|
|
|
|
|
|
|
do {
|
|
|
|
prev = timebase;
|
2013-08-21 00:33:12 +00:00
|
|
|
asm volatile("mfspr %0, %1" : "=r" (timebase) :
|
|
|
|
"i" (SPRN_TBRL));
|
2013-07-24 01:21:11 +00:00
|
|
|
} while (prev != timebase);
|
|
|
|
}
|
|
|
|
#else
|
2012-07-20 12:42:35 +00:00
|
|
|
timebase = get_tb();
|
2013-07-24 01:21:11 +00:00
|
|
|
#endif
|
2012-07-20 12:42:35 +00:00
|
|
|
mb();
|
|
|
|
tb_valid = 1;
|
|
|
|
|
|
|
|
while (tb_valid)
|
|
|
|
barrier();
|
|
|
|
|
|
|
|
mpc85xx_timebase_freeze(0);
|
|
|
|
|
|
|
|
local_irq_restore(flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mpc85xx_take_timebase(void)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
local_irq_save(flags);
|
|
|
|
|
|
|
|
tb_req = 1;
|
|
|
|
while (!tb_valid)
|
|
|
|
barrier();
|
|
|
|
|
|
|
|
set_tb(timebase >> 32, timebase & 0xffffffff);
|
|
|
|
isync();
|
|
|
|
tb_valid = 0;
|
|
|
|
|
|
|
|
local_irq_restore(flags);
|
|
|
|
}
|
|
|
|
|
2012-07-20 12:42:36 +00:00
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
2013-06-24 19:30:09 +00:00
|
|
|
static void smp_85xx_mach_cpu_die(void)
|
2012-07-20 12:42:36 +00:00
|
|
|
{
|
|
|
|
unsigned int cpu = smp_processor_id();
|
|
|
|
u32 tmp;
|
|
|
|
|
|
|
|
local_irq_disable();
|
|
|
|
idle_task_exit();
|
|
|
|
generic_set_cpu_dead(cpu);
|
|
|
|
mb();
|
|
|
|
|
|
|
|
mtspr(SPRN_TCR, 0);
|
|
|
|
|
|
|
|
__flush_disable_L1();
|
|
|
|
tmp = (mfspr(SPRN_HID0) & ~(HID0_DOZE|HID0_SLEEP)) | HID0_NAP;
|
|
|
|
mtspr(SPRN_HID0, tmp);
|
|
|
|
isync();
|
|
|
|
|
|
|
|
/* Enter NAP mode. */
|
|
|
|
tmp = mfmsr();
|
|
|
|
tmp |= MSR_WE;
|
|
|
|
mb();
|
|
|
|
mtmsr(tmp);
|
|
|
|
isync();
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-09-29 23:44:35 +00:00
|
|
|
static inline void flush_spin_table(void *spin_table)
|
|
|
|
{
|
|
|
|
flush_dcache_range((ulong)spin_table,
|
|
|
|
(ulong)spin_table + sizeof(struct epapr_spin_table));
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline u32 read_spin_table_addr_l(void *spin_table)
|
|
|
|
{
|
|
|
|
flush_dcache_range((ulong)spin_table,
|
|
|
|
(ulong)spin_table + sizeof(struct epapr_spin_table));
|
|
|
|
return in_be32(&((struct epapr_spin_table *)spin_table)->addr_l);
|
|
|
|
}
|
|
|
|
|
2013-06-24 19:30:09 +00:00
|
|
|
static int smp_85xx_kick_cpu(int nr)
|
2008-11-19 15:35:56 +00:00
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
const u64 *cpu_rel_addr;
|
2012-07-20 12:42:33 +00:00
|
|
|
__iomem struct epapr_spin_table *spin_table;
|
2008-11-19 15:35:56 +00:00
|
|
|
struct device_node *np;
|
2012-07-20 12:42:36 +00:00
|
|
|
int hw_cpu = get_hard_smp_processor_id(nr);
|
2009-12-18 22:50:37 +00:00
|
|
|
int ioremappable;
|
2012-07-20 12:42:36 +00:00
|
|
|
int ret = 0;
|
2008-11-19 15:35:56 +00:00
|
|
|
|
2011-10-13 15:13:09 +00:00
|
|
|
WARN_ON(nr < 0 || nr >= NR_CPUS);
|
|
|
|
WARN_ON(hw_cpu < 0 || hw_cpu >= NR_CPUS);
|
2008-11-19 15:35:56 +00:00
|
|
|
|
|
|
|
pr_debug("smp_85xx_kick_cpu: kick CPU #%d\n", nr);
|
|
|
|
|
|
|
|
np = of_get_cpu_node(nr, NULL);
|
|
|
|
cpu_rel_addr = of_get_property(np, "cpu-release-addr", NULL);
|
|
|
|
|
|
|
|
if (cpu_rel_addr == NULL) {
|
|
|
|
printk(KERN_ERR "No cpu-release-addr for cpu %d\n", nr);
|
2011-04-11 21:46:19 +00:00
|
|
|
return -ENOENT;
|
2008-11-19 15:35:56 +00:00
|
|
|
}
|
|
|
|
|
2009-12-18 22:50:37 +00:00
|
|
|
/*
|
|
|
|
* A secondary core could be in a spinloop in the bootpage
|
|
|
|
* (0xfffff000), somewhere in highmem, or somewhere in lowmem.
|
|
|
|
* The bootpage and highmem can be accessed via ioremap(), but
|
|
|
|
* we need to directly access the spinloop if its in lowmem.
|
|
|
|
*/
|
|
|
|
ioremappable = *cpu_rel_addr > virt_to_phys(high_memory);
|
|
|
|
|
2008-11-19 15:35:56 +00:00
|
|
|
/* Map the spin table */
|
2009-12-18 22:50:37 +00:00
|
|
|
if (ioremappable)
|
2012-09-29 23:44:35 +00:00
|
|
|
spin_table = ioremap_prot(*cpu_rel_addr,
|
|
|
|
sizeof(struct epapr_spin_table), _PAGE_COHERENT);
|
2009-12-18 22:50:37 +00:00
|
|
|
else
|
2012-07-20 12:42:33 +00:00
|
|
|
spin_table = phys_to_virt(*cpu_rel_addr);
|
2008-11-19 15:35:56 +00:00
|
|
|
|
2009-06-19 08:30:42 +00:00
|
|
|
local_irq_save(flags);
|
2012-07-20 12:42:36 +00:00
|
|
|
#ifdef CONFIG_PPC32
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
/* Corresponding to generic_set_cpu_dead() */
|
|
|
|
generic_set_cpu_up(nr);
|
|
|
|
|
|
|
|
if (system_state == SYSTEM_RUNNING) {
|
2012-09-29 23:44:35 +00:00
|
|
|
/*
|
|
|
|
* To keep it compatible with old boot program which uses
|
|
|
|
* cache-inhibit spin table, we need to flush the cache
|
|
|
|
* before accessing spin table to invalidate any staled data.
|
|
|
|
* We also need to flush the cache after writing to spin
|
|
|
|
* table to push data out.
|
|
|
|
*/
|
|
|
|
flush_spin_table(spin_table);
|
2012-07-20 12:42:36 +00:00
|
|
|
out_be32(&spin_table->addr_l, 0);
|
2012-09-29 23:44:35 +00:00
|
|
|
flush_spin_table(spin_table);
|
2009-06-19 08:30:42 +00:00
|
|
|
|
2012-07-20 12:42:36 +00:00
|
|
|
/*
|
|
|
|
* We don't set the BPTR register here since it already points
|
|
|
|
* to the boot page properly.
|
|
|
|
*/
|
2013-04-03 13:09:09 +00:00
|
|
|
mpic_reset_core(nr);
|
2012-07-20 12:42:36 +00:00
|
|
|
|
2012-09-29 23:44:35 +00:00
|
|
|
/*
|
|
|
|
* wait until core is ready...
|
|
|
|
* We need to invalidate the stale data, in case the boot
|
|
|
|
* loader uses a cache-inhibited spin table.
|
|
|
|
*/
|
|
|
|
if (!spin_event_timeout(
|
|
|
|
read_spin_table_addr_l(spin_table) == 1,
|
|
|
|
10000, 100)) {
|
2012-07-20 12:42:36 +00:00
|
|
|
pr_err("%s: timeout waiting for core %d to reset\n",
|
|
|
|
__func__, hw_cpu);
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* clear the acknowledge status */
|
|
|
|
__secondary_hold_acknowledge = -1;
|
|
|
|
}
|
|
|
|
#endif
|
2012-09-29 23:44:35 +00:00
|
|
|
flush_spin_table(spin_table);
|
2012-07-20 12:42:33 +00:00
|
|
|
out_be32(&spin_table->pir, hw_cpu);
|
|
|
|
out_be32(&spin_table->addr_l, __pa(__early_start));
|
2012-09-29 23:44:35 +00:00
|
|
|
flush_spin_table(spin_table);
|
2009-12-18 22:50:37 +00:00
|
|
|
|
2008-11-19 15:35:56 +00:00
|
|
|
/* Wait a bit for the CPU to ack. */
|
2012-07-20 12:42:36 +00:00
|
|
|
if (!spin_event_timeout(__secondary_hold_acknowledge == hw_cpu,
|
|
|
|
10000, 100)) {
|
|
|
|
pr_err("%s: timeout waiting for core %d to ack\n",
|
|
|
|
__func__, hw_cpu);
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
out:
|
2010-10-08 15:37:31 +00:00
|
|
|
#else
|
2011-02-15 04:45:48 +00:00
|
|
|
smp_generic_kick_cpu(nr);
|
|
|
|
|
2012-09-29 23:44:35 +00:00
|
|
|
flush_spin_table(spin_table);
|
2012-07-20 12:42:36 +00:00
|
|
|
out_be32(&spin_table->pir, hw_cpu);
|
2012-07-20 12:42:33 +00:00
|
|
|
out_be64((u64 *)(&spin_table->addr_h),
|
2014-03-11 00:54:06 +00:00
|
|
|
__pa(ppc_function_entry(generic_secondary_smp_init)));
|
2012-09-29 23:44:35 +00:00
|
|
|
flush_spin_table(spin_table);
|
2010-10-08 15:37:31 +00:00
|
|
|
#endif
|
2008-11-19 15:35:56 +00:00
|
|
|
|
|
|
|
local_irq_restore(flags);
|
|
|
|
|
2009-12-18 22:50:37 +00:00
|
|
|
if (ioremappable)
|
2012-07-20 12:42:33 +00:00
|
|
|
iounmap(spin_table);
|
2009-06-19 08:30:42 +00:00
|
|
|
|
2012-07-20 12:42:36 +00:00
|
|
|
return ret;
|
2008-11-19 15:35:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
struct smp_ops_t smp_85xx_ops = {
|
|
|
|
.kick_cpu = smp_85xx_kick_cpu,
|
2013-08-05 19:58:35 +00:00
|
|
|
.cpu_bootable = smp_generic_cpu_bootable,
|
2012-07-20 12:42:36 +00:00
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
.cpu_disable = generic_cpu_disable,
|
|
|
|
.cpu_die = generic_cpu_die,
|
|
|
|
#endif
|
2010-07-21 21:14:53 +00:00
|
|
|
#ifdef CONFIG_KEXEC
|
|
|
|
.give_timebase = smp_generic_give_timebase,
|
|
|
|
.take_timebase = smp_generic_take_timebase,
|
|
|
|
#endif
|
2008-11-19 15:35:56 +00:00
|
|
|
};
|
|
|
|
|
2010-07-21 21:14:53 +00:00
|
|
|
#ifdef CONFIG_KEXEC
|
2010-09-16 22:58:25 +00:00
|
|
|
atomic_t kexec_down_cpus = ATOMIC_INIT(0);
|
2010-07-21 21:14:53 +00:00
|
|
|
|
|
|
|
void mpc85xx_smp_kexec_cpu_down(int crash_shutdown, int secondary)
|
|
|
|
{
|
2010-09-16 22:58:25 +00:00
|
|
|
local_irq_disable();
|
2010-07-21 21:14:53 +00:00
|
|
|
|
2010-09-16 22:58:25 +00:00
|
|
|
if (secondary) {
|
|
|
|
atomic_inc(&kexec_down_cpus);
|
|
|
|
/* loop forever */
|
2010-07-21 21:14:53 +00:00
|
|
|
while (1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mpc85xx_smp_kexec_down(void *arg)
|
|
|
|
{
|
|
|
|
if (ppc_md.kexec_cpu_down)
|
|
|
|
ppc_md.kexec_cpu_down(0,1);
|
|
|
|
}
|
|
|
|
|
2010-09-16 22:58:26 +00:00
|
|
|
static void map_and_flush(unsigned long paddr)
|
|
|
|
{
|
|
|
|
struct page *page = pfn_to_page(paddr >> PAGE_SHIFT);
|
|
|
|
unsigned long kaddr = (unsigned long)kmap(page);
|
|
|
|
|
|
|
|
flush_dcache_range(kaddr, kaddr + PAGE_SIZE);
|
|
|
|
kunmap(page);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Before we reset the other cores, we need to flush relevant cache
|
|
|
|
* out to memory so we don't get anything corrupted, some of these flushes
|
|
|
|
* are performed out of an overabundance of caution as interrupts are not
|
|
|
|
* disabled yet and we can switch cores
|
|
|
|
*/
|
|
|
|
static void mpc85xx_smp_flush_dcache_kexec(struct kimage *image)
|
|
|
|
{
|
|
|
|
kimage_entry_t *ptr, entry;
|
|
|
|
unsigned long paddr;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (image->type == KEXEC_TYPE_DEFAULT) {
|
|
|
|
/* normal kexec images are stored in temporary pages */
|
|
|
|
for (ptr = &image->head; (entry = *ptr) && !(entry & IND_DONE);
|
|
|
|
ptr = (entry & IND_INDIRECTION) ?
|
|
|
|
phys_to_virt(entry & PAGE_MASK) : ptr + 1) {
|
|
|
|
if (!(entry & IND_DESTINATION)) {
|
|
|
|
map_and_flush(entry);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* flush out last IND_DONE page */
|
|
|
|
map_and_flush(entry);
|
|
|
|
} else {
|
|
|
|
/* crash type kexec images are copied to the crash region */
|
|
|
|
for (i = 0; i < image->nr_segments; i++) {
|
|
|
|
struct kexec_segment *seg = &image->segment[i];
|
|
|
|
for (paddr = seg->mem; paddr < seg->mem + seg->memsz;
|
|
|
|
paddr += PAGE_SIZE) {
|
|
|
|
map_and_flush(paddr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* also flush the kimage struct to be passed in as well */
|
|
|
|
flush_dcache_range((unsigned long)image,
|
|
|
|
(unsigned long)image + sizeof(*image));
|
|
|
|
}
|
|
|
|
|
2010-07-21 21:14:53 +00:00
|
|
|
static void mpc85xx_smp_machine_kexec(struct kimage *image)
|
|
|
|
{
|
2010-09-16 22:58:25 +00:00
|
|
|
int timeout = INT_MAX;
|
|
|
|
int i, num_cpus = num_present_cpus();
|
2010-07-21 21:14:53 +00:00
|
|
|
|
2010-09-16 22:58:26 +00:00
|
|
|
mpc85xx_smp_flush_dcache_kexec(image);
|
2010-07-21 21:14:53 +00:00
|
|
|
|
2010-09-16 22:58:25 +00:00
|
|
|
if (image->type == KEXEC_TYPE_DEFAULT)
|
|
|
|
smp_call_function(mpc85xx_smp_kexec_down, NULL, 0);
|
2010-07-21 21:14:53 +00:00
|
|
|
|
2010-09-16 22:58:25 +00:00
|
|
|
while ( (atomic_read(&kexec_down_cpus) != (num_cpus - 1)) &&
|
2010-07-21 21:14:53 +00:00
|
|
|
( timeout > 0 ) )
|
|
|
|
{
|
|
|
|
timeout--;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( !timeout )
|
|
|
|
printk(KERN_ERR "Unable to bring down secondary cpu(s)");
|
|
|
|
|
2011-10-25 22:54:04 +00:00
|
|
|
for_each_online_cpu(i)
|
2010-07-21 21:14:53 +00:00
|
|
|
{
|
|
|
|
if ( i == smp_processor_id() ) continue;
|
|
|
|
mpic_reset_core(i);
|
|
|
|
}
|
|
|
|
|
|
|
|
default_machine_kexec(image);
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_KEXEC */
|
|
|
|
|
2013-11-07 07:17:17 +00:00
|
|
|
static void smp_85xx_basic_setup(int cpu_nr)
|
2010-08-26 07:49:07 +00:00
|
|
|
{
|
|
|
|
if (cpu_has_feature(CPU_FTR_DBELL))
|
|
|
|
doorbell_setup_this_cpu();
|
|
|
|
}
|
|
|
|
|
2013-11-07 07:17:17 +00:00
|
|
|
static void smp_85xx_setup_cpu(int cpu_nr)
|
|
|
|
{
|
|
|
|
mpic_setup_this_cpu();
|
|
|
|
smp_85xx_basic_setup(cpu_nr);
|
|
|
|
}
|
|
|
|
|
2012-07-20 12:42:35 +00:00
|
|
|
static const struct of_device_id mpc85xx_smp_guts_ids[] = {
|
|
|
|
{ .compatible = "fsl,mpc8572-guts", },
|
|
|
|
{ .compatible = "fsl,p1020-guts", },
|
|
|
|
{ .compatible = "fsl,p1021-guts", },
|
|
|
|
{ .compatible = "fsl,p1022-guts", },
|
|
|
|
{ .compatible = "fsl,p1023-guts", },
|
|
|
|
{ .compatible = "fsl,p2020-guts", },
|
|
|
|
{},
|
|
|
|
};
|
|
|
|
|
2009-02-12 04:50:42 +00:00
|
|
|
void __init mpc85xx_smp_init(void)
|
|
|
|
{
|
|
|
|
struct device_node *np;
|
|
|
|
|
2010-08-26 07:49:07 +00:00
|
|
|
|
2009-02-12 04:50:42 +00:00
|
|
|
np = of_find_node_by_type(NULL, "open-pic");
|
|
|
|
if (np) {
|
|
|
|
smp_85xx_ops.probe = smp_mpic_probe;
|
2013-11-07 07:17:17 +00:00
|
|
|
smp_85xx_ops.setup_cpu = smp_85xx_setup_cpu;
|
2009-02-12 04:50:42 +00:00
|
|
|
smp_85xx_ops.message_pass = smp_mpic_message_pass;
|
2013-11-07 07:17:17 +00:00
|
|
|
} else
|
|
|
|
smp_85xx_ops.setup_cpu = smp_85xx_basic_setup;
|
2009-02-12 04:50:42 +00:00
|
|
|
|
powerpc: Consolidate ipi message mux and demux
Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.
The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger). However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu. To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops. Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu. Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.
This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).
I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.
The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code. The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number. While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call. I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.
The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature. The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.
Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context. Add the missing calls.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2011-05-10 19:29:39 +00:00
|
|
|
if (cpu_has_feature(CPU_FTR_DBELL)) {
|
2011-07-07 13:44:30 +00:00
|
|
|
/*
|
|
|
|
* If left NULL, .message_pass defaults to
|
|
|
|
* smp_muxed_ipi_message_pass
|
|
|
|
*/
|
2011-10-12 00:06:42 +00:00
|
|
|
smp_85xx_ops.message_pass = NULL;
|
powerpc: Consolidate ipi message mux and demux
Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.
The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger). However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu. To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops. Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu. Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.
This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).
I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.
The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code. The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number. While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call. I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.
The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature. The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.
Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context. Add the missing calls.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2011-05-10 19:29:39 +00:00
|
|
|
smp_85xx_ops.cause_ipi = doorbell_cause_ipi;
|
2013-11-07 07:17:17 +00:00
|
|
|
smp_85xx_ops.probe = NULL;
|
powerpc: Consolidate ipi message mux and demux
Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.
The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger). However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu. To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops. Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu. Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.
This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).
I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.
The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code. The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number. While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call. I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.
The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature. The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.
Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context. Add the missing calls.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2011-05-10 19:29:39 +00:00
|
|
|
}
|
2009-02-12 04:50:42 +00:00
|
|
|
|
2012-07-20 12:42:35 +00:00
|
|
|
np = of_find_matching_node(NULL, mpc85xx_smp_guts_ids);
|
|
|
|
if (np) {
|
|
|
|
guts = of_iomap(np, 0);
|
|
|
|
of_node_put(np);
|
|
|
|
if (!guts) {
|
|
|
|
pr_err("%s: Could not map guts node address\n",
|
|
|
|
__func__);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
smp_85xx_ops.give_timebase = mpc85xx_give_timebase;
|
|
|
|
smp_85xx_ops.take_timebase = mpc85xx_take_timebase;
|
2012-07-20 12:42:36 +00:00
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
ppc_md.cpu_die = smp_85xx_mach_cpu_die;
|
|
|
|
#endif
|
2012-07-20 12:42:35 +00:00
|
|
|
}
|
|
|
|
|
2008-11-19 15:35:56 +00:00
|
|
|
smp_ops = &smp_85xx_ops;
|
2010-07-21 21:14:53 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_KEXEC
|
|
|
|
ppc_md.kexec_cpu_down = mpc85xx_smp_kexec_cpu_down;
|
|
|
|
ppc_md.machine_kexec = mpc85xx_smp_machine_kexec;
|
|
|
|
#endif
|
2008-11-19 15:35:56 +00:00
|
|
|
}
|