mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-28 23:24:50 +00:00
Code Issues Releases Wiki Activity

MIPS: APRP: Add support for Malta CMP platform.

Browse source 
Malta with multi-core CM platforms can now use APRP functionality.

Signed-off-by: Deng-Cheng Zhu <dengcheng.zhu@imgtec.com>
Signed-off-by: Steven J. Hill <Steven.Hill@imgtec.com>
Reviewed-by: Qais Yousef <Qais.Yousef@imgtec.com>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6096/
This commit is contained in:
Deng-Cheng Zhu 2013-10-30 15:52:10 -05:00 committed by Ralf Baechle
parent da615cf603
commit 1336113a6c
3 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/mips/include/asm/amon.h
View file

@ -3,5 +3,5 @@
*/ */
int amon_cpu_avail(int); int amon_cpu_avail(int);
void amon_cpu_start(int, unsigned long, unsigned long, int amon_cpu_start(int, unsigned long, unsigned long,
unsigned long, unsigned long); unsigned long, unsigned long);

24
arch/mips/mti-malta/malta-amon.c
View file

@ -25,6 +25,7 @@
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/mips-boards/launch.h> #include <asm/mips-boards/launch.h>
#include <asm/mipsmtregs.h> #include <asm/mipsmtregs.h>
#include <asm/vpe.h>
int amon_cpu_avail(int cpu) int amon_cpu_avail(int cpu)
{ {
@ -48,7 +49,7 @@ int amon_cpu_avail(int cpu)
return 1; return 1;
} }
void amon_cpu_start(int cpu, int amon_cpu_start(int cpu,
unsigned long pc, unsigned long sp, unsigned long pc, unsigned long sp,
unsigned long gp, unsigned long a0) unsigned long gp, unsigned long a0)
{ {
@ -56,10 +57,10 @@ void amon_cpu_start(int cpu,
(struct cpulaunch *)CKSEG0ADDR(CPULAUNCH); (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH);
if (!amon_cpu_avail(cpu)) if (!amon_cpu_avail(cpu))
return; return -1;
if (cpu == smp_processor_id()) { if (cpu == smp_processor_id()) {
pr_debug("launch: I am cpu%d!\n", cpu); pr_debug("launch: I am cpu%d!\n", cpu);
return; return -1;
} }
launch += cpu; launch += cpu;
@ -78,4 +79,21 @@ void amon_cpu_start(int cpu,
; ;
smp_rmb(); /* Target will be updating flags soon */ smp_rmb(); /* Target will be updating flags soon */
pr_debug("launch: cpu%d gone!\n", cpu); pr_debug("launch: cpu%d gone!\n", cpu);
return 0;
} }
#ifdef CONFIG_MIPS_VPE_LOADER
int vpe_run(struct vpe *v)
{
struct vpe_notifications *n;
if (amon_cpu_start(aprp_cpu_index(), v->__start, 0, 0, 0) < 0)
return -1;
list_for_each_entry(n, &v->notify, list)
n->start(VPE_MODULE_MINOR);
return 0;
}
#endif

12
arch/mips/mti-malta/malta-int.c
View file

@ -2,6 +2,7 @@
* Carsten Langgaard, carstenl@mips.com * Carsten Langgaard, carstenl@mips.com
* Copyright (C) 2000, 2001, 2004 MIPS Technologies, Inc. * Copyright (C) 2000, 2001, 2004 MIPS Technologies, Inc.
* Copyright (C) 2001 Ralf Baechle * Copyright (C) 2001 Ralf Baechle
* Copyright (C) 2013 Imagination Technologies Ltd.
* *
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
@ -44,6 +45,7 @@
#include <asm/gic.h> #include <asm/gic.h>
#include <asm/gcmpregs.h> #include <asm/gcmpregs.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/rtlx.h>
int gcmp_present = -1; int gcmp_present = -1;
static unsigned long _msc01_biu_base; static unsigned long _msc01_biu_base;
@ -126,6 +128,11 @@ static void malta_hw0_irqdispatch(void)
} }
do_IRQ(MALTA_INT_BASE + irq); do_IRQ(MALTA_INT_BASE + irq);
#ifdef MIPS_VPE_APSP_API
if (aprp_hook)
aprp_hook();
#endif
} }
static void malta_ipi_irqdispatch(void) static void malta_ipi_irqdispatch(void)
@ -313,6 +320,11 @@ static void ipi_call_dispatch(void)
static irqreturn_t ipi_resched_interrupt(int irq, void *dev_id) static irqreturn_t ipi_resched_interrupt(int irq, void *dev_id)
{ {
#ifdef MIPS_VPE_APSP_API
if (aprp_hook)
aprp_hook();
#endif
scheduler_ipi(); scheduler_ipi();
return IRQ_HANDLED; return IRQ_HANDLED;