[PATCH 2/3] powerpc: book3e: Add ICSWX/ACOP support to Book3e cores like A2

[Kumar Gala]

On Aug 8, 2011, at 5:26 PM, Jimi Xenidis wrote:

> ICSWX is also used by the A2 processor to access coprocessors,
> although not all "chips" that contain A2s have coprocessors.
> 
> Signed-off-by: Jimi Xenidis <jimix at pobox.com>
> ---
> arch/powerpc/include/asm/cputable.h   |    2 +-
> arch/powerpc/include/asm/mmu-book3e.h |    4 ++++
> arch/powerpc/include/asm/reg_booke.h  |    4 ++++
> arch/powerpc/kernel/cpu_setup_a2.S    |   10 ++++++++--
> arch/powerpc/platforms/wsp/Kconfig    |    1 +
> 5 files changed, 18 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
> index e30442c..7044233 100644
> --- a/arch/powerpc/include/asm/cputable.h
> +++ b/arch/powerpc/include/asm/cputable.h
> @@ -437,7 +437,7 @@ extern const char *powerpc_base_platform;
> #define CPU_FTRS_COMPATIBLE	(CPU_FTR_USE_TB | CPU_FTR_PPCAS_ARCH_V2)
> 
> #define CPU_FTRS_A2 (CPU_FTR_USE_TB | CPU_FTR_SMT | CPU_FTR_DBELL | \
> -		     CPU_FTR_NOEXECUTE | CPU_FTR_NODSISRALIGN)
> +		     CPU_FTR_NOEXECUTE | CPU_FTR_NODSISRALIGN | CPU_FTR_ICSWX)
> 
> #ifdef __powerpc64__
> #ifdef CONFIG_PPC_BOOK3E
> diff --git a/arch/powerpc/include/asm/mmu-book3e.h b/arch/powerpc/include/asm/mmu-book3e.h
> index 3ea0f9a..06d7f91 100644
> --- a/arch/powerpc/include/asm/mmu-book3e.h
> +++ b/arch/powerpc/include/asm/mmu-book3e.h
> @@ -212,6 +212,10 @@ typedef struct {
> 	unsigned int	id;
> 	unsigned int	active;
> 	unsigned long	vdso_base;
> +#ifdef CONFIG_PPC_ICSWX
> +	struct spinlock *cop_lockp; /* guard acop and cop_pid */
> +	unsigned long acop;	/* mask of enabled coprocessor types */
> +#endif /* CONFIG_PPC_ICSWX */

match whitespace (tab) formatting.

> } mm_context_t;
> 
> /* Page size definitions, common between 32 and 64-bit

- k