[PATCH v11 4/9] ARM: l2c: Add interface to ask hypervisor to configure L2C

[Tony Lindgren]

* Marek Szyprowski <m.szyprowski at samsung.com> [150105 04:22]:
> From: Tomasz Figa <t.figa at samsung.com>
> 
> Because certain secure hypervisor do not allow writes to individual L2C
> registers, but rather expect set of parameters to be passed as argument
> to secure monitor calls, there is a need to provide an interface for the
> L2C driver to ask the firmware to configure the hardware according to
> specified parameters. This patch adds such.
> 
> Signed-off-by: Tomasz Figa <t.figa at samsung.com>
> Signed-off-by: Marek Szyprowski <m.szyprowski at samsung.com>

Acked-by: Tony Lindgren <tony at atomide.com>

> ---
>  arch/arm/include/asm/outercache.h | 3 +++
>  arch/arm/mm/cache-l2x0.c          | 6 ++++++
>  2 files changed, 9 insertions(+)
> 
> diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
> index 891a56b35bcf..563b92fc2f41 100644
> --- a/arch/arm/include/asm/outercache.h
> +++ b/arch/arm/include/asm/outercache.h
> @@ -23,6 +23,8 @@
>  
>  #include <linux/types.h>
>  
> +struct l2x0_regs;
> +
>  struct outer_cache_fns {
>  	void (*inv_range)(unsigned long, unsigned long);
>  	void (*clean_range)(unsigned long, unsigned long);
> @@ -36,6 +38,7 @@ struct outer_cache_fns {
>  
>  	/* This is an ARM L2C thing */
>  	void (*write_sec)(unsigned long, unsigned);
> +	void (*configure)(const struct l2x0_regs *);
>  };
>  
>  extern struct outer_cache_fns outer_cache;
> diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
> index f9013320c8ce..dcde6086a228 100644
> --- a/arch/arm/mm/cache-l2x0.c
> +++ b/arch/arm/mm/cache-l2x0.c
> @@ -110,6 +110,11 @@ static inline void l2c_unlock(void __iomem *base, unsigned num)
>  
>  static void l2c_configure(void __iomem *base)
>  {
> +	if (outer_cache.configure) {
> +		outer_cache.configure(&l2x0_saved_regs);
> +		return;
> +	}
> +
>  	if (l2x0_data->configure)
>  		l2x0_data->configure(base);
>  
> @@ -910,6 +915,7 @@ static int __init __l2c_init(const struct l2c_init_data *data,
>  
>  	fns = data->outer_cache;
>  	fns.write_sec = outer_cache.write_sec;
> +	fns.configure = outer_cache.configure;
>  	if (data->fixup)
>  		data->fixup(l2x0_base, cache_id, &fns);
>  
> -- 
> 1.9.2
>