On Sat, Dec 30, 2017 at 1:34 PM, Peng Fan <[email protected]> wrote: > Some PL310 registers could only be wrote in secure world, so > introduce imx_l2c310_write_sec to support Linux running in > non-secure world configure PL310. > > Signed-off-by: Peng Fan <[email protected]> > Cc: Shawn Guo <[email protected]> > Cc: Sascha Hauer <[email protected]> > Cc: Fabio Estevam <[email protected]> > Cc: Dong Aisheng <[email protected]> > --- > > V2: > Use SPDX Tag > Use CONFIG_HAVE_ARM_SMCCC to fix build error for armv5. > Add IS_ENABLED(CONFIG_OPTEE) check when assigning write_sec > > arch/arm/mach-imx/system.c | 27 ++++++++++++++++++++++++++- > include/soc/imx/imx_sip_smc.h | 21 +++++++++++++++++++++ > 2 files changed, 47 insertions(+), 1 deletion(-) > create mode 100644 include/soc/imx/imx_sip_smc.h > > diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c > index c06af650e6b1..2c27e52d8c7d 100644 > --- a/arch/arm/mach-imx/system.c > +++ b/arch/arm/mach-imx/system.c > @@ -23,11 +23,13 @@ > #include <linux/delay.h> > #include <linux/of.h> > #include <linux/of_address.h> > +#include <soc/imx/imx_sip_smc.h> > > #include <asm/system_misc.h> > #include <asm/proc-fns.h> > #include <asm/mach-types.h> > #include <asm/hardware/cache-l2x0.h> > +#include <asm/outercache.h> > > #include "common.h" > #include "hardware.h" > @@ -92,6 +94,22 @@ void __init imx1_reset_init(void __iomem *base) > #endif > > #ifdef CONFIG_CACHE_L2X0 > +#ifdef CONFIG_HAVE_ARM_SMCCC > +void imx_l2c310_write_sec(unsigned long val, unsigned int reg) > +{ > + struct arm_smccc_res res; > + > + arm_smccc_smc(IMX_SIP_SMC_L2C310, val, reg, 0, 0, 0, 0, 0, &res); > + > + if (res.a0 != 0) > + pr_err("Failed to write l2c310 0x%x: 0x%lx\n", reg, res.a0); > +} > +#else > +void imx_l2c310_write_sec(unsigned long val, unsigned int reg) > +{ > +} > +#endif > + > void __init imx_init_l2cache(void) > { > void __iomem *l2x0_base; > @@ -102,6 +120,10 @@ void __init imx_init_l2cache(void) > if (!np) > return; > > + if (IS_ENABLED(CONFIG_OPTEE) && > + of_find_compatible_node(NULL, NULL, "linaro,optee-tz")) > + outer_cache.write_sec = imx_l2c310_write_sec; > + > l2x0_base = of_iomap(np, 0); > if (!l2x0_base) > goto put_node; > @@ -117,7 +139,10 @@ void __init imx_init_l2cache(void) > val &= ~L310_PREFETCH_CTRL_OFFSET_MASK; > val |= 15; > > - writel_relaxed(val, l2x0_base + L310_PREFETCH_CTRL); > + if (outer_cache.write_sec) > + outer_cache.write_sec(val, L310_PREFETCH_CTRL); > + else > + writel_relaxed(val, l2x0_base + L310_PREFETCH_CTRL); > } > > iounmap(l2x0_base); > diff --git a/include/soc/imx/imx_sip_smc.h b/include/soc/imx/imx_sip_smc.h > new file mode 100644 > index 000000000000..c35ae69e0d2f > --- /dev/null > +++ b/include/soc/imx/imx_sip_smc.h > @@ -0,0 +1,21 @@ > +/* > + * Copyright 2017 NXP > + * > + * SPDX-License-Identifier: GPL-2.0 > + */ > +
Thanks! but the SPDX tag should be on the first line as its own comment. So this would come out something like this > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* Copyright 2017 NXP */ or > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Copyright 2017 NXP > + */ > +#ifndef __IMX_SIP_SMC_H_ > +#define __IMX_SIP_SMC_H_ > + > +#include <linux/arm-smccc.h> > + > +#define IMX_SIP_SMC_VAL(func) ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ > + ARM_SMCCC_SMC_32, \ > + ARM_SMCCC_OWNER_SIP, \ > + (func)) > + > +#define IMX_L2C310 0x1 > + > +#define IMX_SIP_SMC_L2C310 IMX_SIP_SMC_VAL(IMX_L2C310) > + > +#endif > -- > 2.14.1 > -- Cordially Philippe Ombredanne
