drivers: tzc380: add tzc380 driver #1578

MrVan · 2017-06-02T08:39:40Z

Add tzc380 driver support.

The usage:
Use tzc_init(vaddr_t base) to get the tzc380 configuration.
Use tzc_configure_region to configure the memory region,
such as "tzc_configure_region(5, 0x4e000000,
TZC_ATTR_REGION_SIZE(TZC_REGION_SIZE_32M) | TZC_ATTR_REGION_EN_MASK |
TZC_ATTR_SP_S_RW);"

An example for 6ULEVK:

        tzc_init(addr);

        tzc_configure_region(0, 0x00000000, TZC_ATTR_REGION_SIZE(TZC_REGION_SIZE_4G) | TZC_ATTR_REGION_EN_MASK | TZC_ATTR_SP_ALL);
        tzc_configure_region(1, 0x80000000, TZC_ATTR_REGION_SIZE(TZC_REGION_SIZE_2G) | TZC_ATTR_REGION_EN_MASK | TZC_ATTR_SP_NS_RW);
        tzc_configure_region(2, 0x9e000000, TZC_ATTR_REGION_SIZE(TZC_REGION_SIZE_32M) | TZC_ATTR_REGION_EN_MASK | TZC_ATTR_SP_S_RW);
        tzc_configure_region(3, 0x9e000000, TZC_ATTR_REGION_SIZE(TZC_REGION_SIZE_2M) | TZC_ATTR_REGION_EN_MASK | TZC_ATTR_SP_ALL);

        tzc_dump_state();

etienne-lms

some minor comments but looks ok to me.

etienne-lms · 2017-06-02T09:36:44Z

core/include/drivers/tzc380.h

+#define TZC_REGION_SIZE_16E	(0x3f)
+
+#define TZC_REGION_SIZE_SHIFT	(0x1)
+#define TZC_REGION_SIZE_MASK	(0x3f << 1)


#define TZC_REGION_SIZE_MASK GENMASK_32(7, 1);

Fix in next version.

etienne-lms · 2017-06-02T09:38:46Z

core/include/drivers/tzc380.h

+#define TZC_REGION_SIZE_MASK	(0x3f << 1)
+#define TZC_ATTR_REGION_SIZE(s)	((s) << TZC_REGION_SIZE_SHIFT)
+
+#define TZC_ATTR()


empty macro ?

Drop this in next version. Thanks.

etienne-lms · 2017-06-02T09:40:09Z

core/include/drivers/tzc380.h

+#define TZC_SP_NS_W		(1 << 0)
+#define TZC_SP_NS_R		(1 << 1)
+#define TZC_SP_S_W		(1 << 2)
+#define TZC_SP_S_R		(1 << 3)


#define TZC_SP_NS_W BIT(0) and so on

etienne-lms · 2017-06-02T09:41:01Z

core/include/drivers/tzc380.h

+
+/* Speculation is enabled by default. */
+#define SPECULATION_CTRL_WRITE_DISABLE	(1 << 1)
+#define SPECULATION_CTRL_READ_DISABLE	(1 << 0)


prefer use BIT(1) and BIT(0).

Fix to use BIT for all the bits things in next version

etienne-lms · 2017-06-02T09:41:36Z

core/include/drivers/tzc380.h

+
+#include <stdint.h>
+#include <types_ext.h>
+#include <trace_levels.h>


shift type_ext.h below trace_levels.h

Fix in next version.

etienne-lms · 2017-06-02T09:45:04Z

core/drivers/tzc380.c

+		DMSG("region_base: 0x%08x%08x", temp_32reg_h, temp_32reg);
+		temp_32reg = tzc_read_region_attributes(tzc.base, n);
+		DMSG("region sp: %x", temp_32reg >> TZC_ATTR_SP_SHIFT);
+		DMSG("region size: %x\n", (temp_32reg & TZC_REGION_SIZE_MASK) >> TZC_REGION_SIZE_SHIFT);


style: exeeds 80 chars

Fix in next version.

etienne-lms · 2017-06-02T09:48:25Z

core/drivers/tzc380.c

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */


tzc400.c also includes an ARM-TF notice. Should it be dumped here also ?
* Copyright (c) 2014, ARM Limited and Contributors. All rights reserved.

There is no tzc380 support in ARM-TF.

I was thinking of the tzc400.c from optee which is almost the same as this proposed tzc380.c.

I take tzc400.c as a reference to implement tzc380 support. Simliar functions are implemented in tzc380. But code is not copied from tzc400.c. I am not sure the copyright is needed.

ok. discard my comments. thanks.

MrVan · 2017-06-05T01:27:43Z

Updated with comments addressed.

etienne-lms

Some minor remaining comments. including several parenthesis that could be removed from core/include/drivers/tzc380.h.

Aside these: Acked-by: Etienne Carriere <etienne.carriere@linaro.org>

etienne-lms · 2017-06-06T10:00:53Z

core/drivers/tzc380.c

+static uint32_t addr_high(vaddr_t addr __unused)
+{
+#if (UINTPTR_MAX == UINT64_MAX)
+	return (addr >> 32);


minor style: no need parenthesis

etienne-lms · 2017-06-06T10:01:36Z

core/drivers/tzc380.c

+	return (uint32_t)addr;
+}
+
+static uint32_t addr_high(vaddr_t addr __unused)


minor: prefer __maybe_unused

etienne-lms · 2017-06-06T12:48:51Z

core/drivers/tzc380.c

+		temp_32reg = tzc_read_region_attributes(tzc.base, n);
+		DMSG("region sp: %x", temp_32reg >> TZC_ATTR_SP_SHIFT);
+		DMSG("region size: %x\n", (temp_32reg & TZC_REGION_SIZE_MASK)
+		     >> TZC_REGION_SIZE_SHIFT);


minor style: end line175 with the operator >>.

Add tzc380 driver support. The usage: Use tzc_init(vaddr_t base) to get the tzc380 configuration. Use tzc_configure_region to configure the memory region, such as "tzc_configure_region(5, 0x4e000000, TZC_ATTR_REGION_SIZE(TZC_REGION_SIZE_32M) | TZC_ATTR_REGION_EN_MASK | TZC_ATTR_SP_S_RW);" Signed-off-by: Peng Fan <peng.fan@nxp.com> Acked-by: Etienne Carriere <etienne.carriere@linaro.org>

MrVan · 2017-06-10T08:52:27Z

@etienne-lms Updated.

etienne-lms · 2017-06-12T09:14:58Z

Acked-by: Etienne Carriere <etienne.carriere@linaro.org>

MrVan · 2017-06-12T09:55:58Z

@etienne-lms tags already applied, thanks:)

jforissier · 2017-06-12T10:55:43Z

The failed build status is due to a timeout (Travis seems to be slower than usual today), the final check was almost complete so I'm merging this regardless.

etienne-lms reviewed Jun 2, 2017

View reviewed changes

MrVan force-pushed the tzc380 branch from 05754cc to e3636b3 Compare June 5, 2017 01:23

etienne-lms reviewed Jun 6, 2017

View reviewed changes

MrVan force-pushed the tzc380 branch from e3636b3 to 03eb27f Compare June 9, 2017 02:27

jforissier merged commit 4c56bf5 into OP-TEE:master Jun 12, 2017

MrVan deleted the tzc380 branch September 29, 2017 02:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

drivers: tzc380: add tzc380 driver #1578

drivers: tzc380: add tzc380 driver #1578

MrVan commented Jun 2, 2017

etienne-lms left a comment

etienne-lms Jun 2, 2017

MrVan Jun 2, 2017

etienne-lms Jun 2, 2017

MrVan Jun 2, 2017

etienne-lms Jun 2, 2017

etienne-lms Jun 2, 2017

MrVan Jun 2, 2017

etienne-lms Jun 2, 2017

MrVan Jun 2, 2017

etienne-lms Jun 2, 2017

MrVan Jun 2, 2017

etienne-lms Jun 2, 2017

MrVan Jun 2, 2017

etienne-lms Jun 2, 2017

MrVan Jun 2, 2017

etienne-lms Jun 2, 2017

MrVan commented Jun 5, 2017

etienne-lms left a comment

etienne-lms Jun 6, 2017

etienne-lms Jun 6, 2017

etienne-lms Jun 6, 2017

MrVan commented Jun 10, 2017

etienne-lms commented Jun 12, 2017

MrVan commented Jun 12, 2017

jforissier commented Jun 12, 2017

drivers: tzc380: add tzc380 driver #1578

drivers: tzc380: add tzc380 driver #1578

Conversation

MrVan commented Jun 2, 2017

etienne-lms left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MrVan commented Jun 5, 2017

etienne-lms left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MrVan commented Jun 10, 2017

etienne-lms commented Jun 12, 2017

MrVan commented Jun 12, 2017

jforissier commented Jun 12, 2017