Add the platfrom setup \ terminate support

Add support for Platfrom setup and termination for Cryptocell on Nrf52840

Author: Ron Eldor

features/mbedtls/targets/TARGET_CRYPTOCELL310/TARGET_NRF52840_DK/cc_platform.h

@@ -0,0 +1,33 @@
+/*
+  *  cc_platform.h
+  *
+  *  Copyright (C) 2018, ARM Limited, All Rights Reserved
+  *  SPDX-License-Identifier: Apache-2.0
+  *
+  *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+  *  not use this file except in compliance with the License.
+  *  You may obtain a copy of the License at
+  *
+  *  http://www.apache.org/licenses/LICENSE-2.0
+  *
+  *  Unless required by applicable law or agreed to in writing, software
+  *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  *  See the License for the specific language governing permissions and
+  *  limitations under the License.
+  *
+  */
+#ifndef __CC_PLATFORM_H_
+#define __CC_PLATFORM_H_
+/**
+ * \brief   The CC platform context structure.
+ *
+ * \note    This structure may be used to assist platform-specific
+ *          setup or teardown operations.
+ */
+typedef struct {
+    char dummy; /**< Placeholder member, as empty structs are not portable. */
+}
+cc_platform_ctx;
+
+#endif /* __CC_PLATFORM_H_ */

features/mbedtls/targets/TARGET_CRYPTOCELL310/TARGET_NRF52840_DK/cc_platform_nrf52840.c

@@ -0,0 +1,33 @@
+ /*
+  *  cc_platform_nrf52840.c
+  *
+  *  Copyright (C) 2018, ARM Limited, All Rights Reserved
+  *  SPDX-License-Identifier: Apache-2.0
+  *
+  *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+  *  not use this file except in compliance with the License.
+  *  You may obtain a copy of the License at
+  *
+  *  http://www.apache.org/licenses/LICENSE-2.0
+  *
+  *  Unless required by applicable law or agreed to in writing, software
+  *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  *  See the License for the specific language governing permissions and
+  *  limitations under the License.
+  *
+  */
+
+#include "platform_alt.h"
+#include "nrf52840.h"
+
+int cc_platform_setup( cc_platform_ctx *ctx )
+{
+    NRF_CRYPTOCELL->ENABLE = 1;
+    return ( 0 );
+}
+
+void cc_platform_terminate( cc_platform_ctx *ctx )
+{
+    NRF_CRYPTOCELL->ENABLE = 0;
+}

features/mbedtls/targets/TARGET_CRYPTOCELL310/mbedtls_device.h

@@ -0,0 +1,27 @@
+ /*
+  *  mbedtls_device.h
+  *
+  *  Copyright (C) 2018, ARM Limited, All Rights Reserved
+  *  SPDX-License-Identifier: Apache-2.0
+  *
+  *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+  *  not use this file except in compliance with the License.
+  *  You may obtain a copy of the License at
+  *
+  *  http://www.apache.org/licenses/LICENSE-2.0
+  *
+  *  Unless required by applicable law or agreed to in writing, software
+  *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  *  See the License for the specific language governing permissions and
+  *  limitations under the License.
+  *
+  */
+
+#ifndef __MBEDTLS_DEVICE__
+#define __MBEDTLS_DEVICE__
+
+#define MBEDTLS_AES_ALT
+#define MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT
+
+#endif //__MBEDTLS_DEVICE__

features/mbedtls/targets/TARGET_CRYPTOCELL310/platform_alt.c

@@ -0,0 +1,57 @@
+ /*
+  *  platform_alt.c
+  *
+  *  Copyright (C) 2018, ARM Limited, All Rights Reserved
+  *  SPDX-License-Identifier: Apache-2.0
+  *
+  *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+  *  not use this file except in compliance with the License.
+  *  You may obtain a copy of the License at
+  *
+  *  http://www.apache.org/licenses/LICENSE-2.0
+  *
+  *  Unless required by applicable law or agreed to in writing, software
+  *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  *  See the License for the specific language governing permissions and
+  *  limitations under the License.
+  *
+  */
+
+#include "mbedtls/platform.h"
+#if defined(MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT)
+#include "sns_silib.h"
+
+/* once https://github.com/ARMmbed/mbedtls/issues/1200 will be supported,
+ * rndState should be part of mbedtls_platform_context
+ * Until then, we should keep it global and extern */
+
+CRYS_RND_State_t     rndState = { { 0 } } ;
+CRYS_RND_WorkBuff_t  rndWorkBuff = { { 0 } } ;
+
+
+int mbedtls_platform_setup( mbedtls_platform_context *ctx )
+{
+    int ret = 0;
+    if( ctx == NULL )
+        return ( -1 );
+
+    /* call platform specific code to setup CC driver*/
+    if( ( ret = cc_platform_setup( &ctx->platform_impl_ctx ) ) != 0 )
+        return ( ret );
+
+    if( SaSi_LibInit( &rndState, &rndWorkBuff ) != 0 )
+        return ( -1 );
+    return ( 0 );
+}
+
+void mbedtls_platform_teardown( mbedtls_platform_context *ctx )
+{
+    if( ctx == NULL )
+        return;
+
+    SaSi_LibFini( &rndState );
+    cc_platform_terminate( &ctx->platform_impl_ctx );
+}
+
+#endif /* MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT*/

features/mbedtls/targets/TARGET_CRYPTOCELL310/platform_alt.h

@@ -0,0 +1,69 @@
+/*
+  *  platform_alt.h
+  *
+  *  Copyright (C) 2018, ARM Limited, All Rights Reserved
+  *  SPDX-License-Identifier: Apache-2.0
+  *
+  *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+  *  not use this file except in compliance with the License.
+  *  You may obtain a copy of the License at
+  *
+  *  http://www.apache.org/licenses/LICENSE-2.0
+  *
+  *  Unless required by applicable law or agreed to in writing, software
+  *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  *  See the License for the specific language governing permissions and
+  *  limitations under the License.
+  *
+  */
+
+#ifndef __PLATFORM_ALT__
+#define __PLATFORM_ALT__
+#include "cc_platform.h"
+#include "crys_rnd.h"
+
+/**
+ * \brief   The platform context structure.
+ *
+ * \note    This structure may be used to assist platform-specific
+ *          setup or teardown operations.
+ */
+typedef struct {
+    cc_platform_ctx platform_impl_ctx; /** A context holding all the partner's platform specific context */
+    /*
+     * Add CRYS_RND_State_t rndState; when https://github.com/ARMmbed/mbedtls/issues/1200 is supported
+     * */
+}
+mbedtls_platform_context;
+
+
+/**
+ * \brief   This function performs any partner platform initialization operations,
+ *          needed top enable CryptoCell.
+ *
+ * \param   ctx     The platform specific context.
+ *
+ * \return          \c 0 on success.
+ *
+ * \note    This function is intended to allow platform-specific initialization for CryptoCell,
+ *          and is called before initializing the CC library(SaSi_LibInit). Its
+ *          implementation is platform-specific, and its implementation MUST be provided.
+ *
+ */
+int cc_platform_setup( cc_platform_ctx *ctx );
+
+/**
+ * \brief   This function performs any partner platform teardown operations, to disable CryptoCell.
+ *
+ * \param   ctx     The platform specific context.
+ *
+ * \note    This function is called after terminating CC library(SaSi_LibFini)
+ *          and intended to free any resource used for CryptoCell by the platform.
+ *          Its implementation is platform-specific,and its implementation MUST be provided.
+ *
+ */
+void cc_platform_terminate( cc_platform_ctx *ctx );
+
+#endif /* __PLATFORM_ALT__ */
+

rtos/TARGET_CORTEX/mbed_boot.c

@@ -172,9 +172,7 @@
 #if defined(__IAR_SYSTEMS_ICC__ ) && (__VER__ >= 8000000)
 #include <DLib_Threads.h>
 #endif
-#if DEVICE_CRYPTOCELL
-#include "sns_silib.h"
-#endif
+
 /* Heap limits - only used if set */
 extern unsigned char *mbed_heap_start;
 extern uint32_t mbed_heap_size;
@@ -332,16 +330,6 @@ void mbed_start_main(void)
     osKernelStart();
 }
 
-#if DEVICE_CRYPTOCELL
-#if defined(TOOLCHAIN_GCC)
-CRYS_RND_State_t   rndState = {0};
-CRYS_RND_WorkBuff_t  rndWorkBuff = {0};
-#else
-CRYS_RND_State_t   rndState;
-CRYS_RND_WorkBuff_t  rndWorkBuff;
-#endif
-#endif
-
 /******************** Toolchain specific code ********************/
 
 #if defined (__CC_ARM) || (defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
@@ -430,11 +418,6 @@ void __rt_entry (void) {
     /* Copy the vector table to RAM only if uVisor is not in use. */
 #if !(defined(FEATURE_UVISOR) && defined(TARGET_UVISOR_SUPPORTED))
     mbed_cpy_nvic();
-#endif
-#if DEVICE_CRYPTOCELL
-    if (SaSi_LibInit(&rndState,&rndWorkBuff)) {
-        mbed_die();
-    }
 #endif
     mbed_sdk_init();
     _platform_post_stackheap_init();
@@ -580,11 +563,6 @@ void software_init_hook(void)
     /* Copy the vector table to RAM only if uVisor is not in use. */
 #if !(defined(FEATURE_UVISOR) && defined(TARGET_UVISOR_SUPPORTED))
     mbed_cpy_nvic();
-#endif
-#if DEVICE_CRYPTOCELL
-    if (SaSi_LibInit(&rndState,&rndWorkBuff)) {
-        mbed_die();
-    }
 #endif
     mbed_sdk_init();
     osKernelInitialize();