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

Commit 1336113a authored by Deng-Cheng Zhu's avatar Deng-Cheng Zhu Committed by Ralf Baechle
Browse files

MIPS: APRP: Add support for Malta CMP platform. 



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

Signed-off-by: default avatarDeng-Cheng Zhu <dengcheng.zhu@imgtec.com>
Signed-off-by: default avatarSteven J. Hill <Steven.Hill@imgtec.com>
Reviewed-by: default avatarQais Yousef <Qais.Yousef@imgtec.com>
Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6096/
parent da615cf6

arch/mips/include/asm/amon.h

+2 −2
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ 
 */



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);

arch/mips/mti-malta/malta-amon.c

+21 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <asm/addrspace.h>

#include <asm/mips-boards/launch.h>

#include <asm/mipsmtregs.h>

#include <asm/vpe.h>



int amon_cpu_avail(int cpu)

{
@@ -48,7 +49,7 @@ int amon_cpu_avail(int cpu) 
	return 1;

}



void amon_cpu_start(int cpu,

int amon_cpu_start(int cpu,

		    unsigned long pc, unsigned long sp,

		    unsigned long gp, unsigned long a0)

{
@@ -56,10 +57,10 @@ void amon_cpu_start(int cpu, 
		(struct cpulaunch  *)CKSEG0ADDR(CPULAUNCH);



	if (!amon_cpu_avail(cpu))

		return;

		return -1;

	if (cpu == smp_processor_id()) {

		pr_debug("launch: I am cpu%d!\n", cpu);

		return;

		return -1;

	}

	launch += cpu;
@@ -78,4 +79,21 @@ void amon_cpu_start(int cpu, 
		;

	smp_rmb();	/* Target will be updating flags soon */

	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

arch/mips/mti-malta/malta-int.c

+12 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 * Carsten Langgaard, carstenl@mips.com

 * Copyright (C) 2000, 2001, 2004 MIPS Technologies, Inc.

 * Copyright (C) 2001 Ralf Baechle

 * Copyright (C) 2013 Imagination Technologies Ltd.

 *

 *  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
@@ -44,6 +45,7 @@ 
#include <asm/gic.h>

#include <asm/gcmpregs.h>

#include <asm/setup.h>

#include <asm/rtlx.h>



int gcmp_present = -1;

static unsigned long _msc01_biu_base;
@@ -126,6 +128,11 @@ static void malta_hw0_irqdispatch(void) 
	}



	do_IRQ(MALTA_INT_BASE + irq);



#ifdef MIPS_VPE_APSP_API

	if (aprp_hook)

		aprp_hook();

#endif

}



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)

{

#ifdef MIPS_VPE_APSP_API

	if (aprp_hook)

		aprp_hook();

#endif



	scheduler_ipi();



	return IRQ_HANDLED;