SPM: Correct the condition for handle related function

spm_get_handle_by_client_handle is only used in an established
connection, while tfm_spm_validate_conn_handle is used for both
connection and non-connection.

Change-Id: I614e7a009e750cd78c4759340b1f0d8ca7fca461
Signed-off-by: Summer Qin <[email protected]>

Author: Summer-ARM

secure_fw/spm/cmsis_psa/spm_ipc.c

@@ -164,7 +164,6 @@ struct conn_handle_t *tfm_spm_create_conn_handle(void)
     return p_handle;
 }
 
-#if CONFIG_TFM_CONNECTION_BASED_SERVICE_API == 1
 int32_t tfm_spm_validate_conn_handle(const struct conn_handle_t *conn_handle)
 {
     /* Check the handle address is valid */
@@ -175,7 +174,6 @@ int32_t tfm_spm_validate_conn_handle(const struct conn_handle_t *conn_handle)
 
     return SPM_SUCCESS;
 }
-#endif
 
 int32_t tfm_spm_free_conn_handle(struct conn_handle_t *conn_handle)
 {
@@ -324,7 +322,7 @@ int32_t tfm_spm_check_authorization(uint32_t sid,
 }
 
 /* Message functions */
-
+#if CONFIG_TFM_CONNECTION_BASED_SERVICE_API == 1
 struct conn_handle_t *spm_get_handle_by_client_handle(psa_handle_t handle,
                                                       int32_t client_id)
 {
@@ -341,6 +339,7 @@ struct conn_handle_t *spm_get_handle_by_client_handle(psa_handle_t handle,
 
     return p_conn_handle;
 }
+#endif
 
 struct conn_handle_t *spm_get_handle_by_msg_handle(psa_handle_t msg_handle)
 {

secure_fw/spm/cmsis_psa/spm_ipc.h

@@ -226,6 +226,7 @@ struct service_t *tfm_spm_get_service_by_sid(uint32_t sid);
 
 /************************ Message functions **********************************/
 
+#if CONFIG_TFM_CONNECTION_BASED_SERVICE_API == 1
 /**
  * \brief                   Convert the given client handle to SPM recognised
  *                          handle and verify it.
@@ -239,6 +240,7 @@ struct service_t *tfm_spm_get_service_by_sid(uint32_t sid);
  */
 struct conn_handle_t *spm_get_handle_by_client_handle(psa_handle_t handle,
                                                       int32_t client_id);
+#endif
 
 /**
  * \brief                   Convert the given message handle to SPM recognised