qseecom: Fix clang compilation in qseecom driver
Make changes to ensure qseecom driver compiles
fine with clang enabled.
Change-Id: I390a1438425d77c23438fceb5c2c52063b472c90
Signed-off-by: Anmolpreet Kaur <anmolpre@codeaurora.org>
diff --git a/include/soc/qcom/qseecomi.h b/include/soc/qcom/qseecomi.h
index d249168..410d33e 100644
--- a/include/soc/qcom/qseecomi.h
+++ b/include/soc/qcom/qseecomi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -105,82 +105,82 @@
QSEE_REENTRANCY_PHASE_MAX = 0xFF
};
-__packed struct qsee_apps_region_info_ireq {
+struct qsee_apps_region_info_ireq {
uint32_t qsee_cmd_id;
uint32_t addr;
uint32_t size;
-};
+} __attribute__((__packed__));
-__packed struct qsee_apps_region_info_64bit_ireq {
+struct qsee_apps_region_info_64bit_ireq {
uint32_t qsee_cmd_id;
uint64_t addr;
uint32_t size;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_check_app_ireq {
+struct qseecom_check_app_ireq {
uint32_t qsee_cmd_id;
char app_name[MAX_APP_NAME_SIZE];
-};
+} __attribute__((__packed__));
-__packed struct qseecom_load_app_ireq {
+struct qseecom_load_app_ireq {
uint32_t qsee_cmd_id;
uint32_t mdt_len; /* Length of the mdt file */
uint32_t img_len; /* Length of .bxx and .mdt files */
uint32_t phy_addr; /* phy addr of the start of image */
char app_name[MAX_APP_NAME_SIZE]; /* application name*/
-};
+} __attribute__((__packed__));
-__packed struct qseecom_load_app_64bit_ireq {
+struct qseecom_load_app_64bit_ireq {
uint32_t qsee_cmd_id;
uint32_t mdt_len;
uint32_t img_len;
uint64_t phy_addr;
char app_name[MAX_APP_NAME_SIZE];
-};
+} __attribute__((__packed__));
-__packed struct qseecom_unload_app_ireq {
+struct qseecom_unload_app_ireq {
uint32_t qsee_cmd_id;
uint32_t app_id;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_load_lib_image_ireq {
+struct qseecom_load_lib_image_ireq {
uint32_t qsee_cmd_id;
uint32_t mdt_len;
uint32_t img_len;
uint32_t phy_addr;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_load_lib_image_64bit_ireq {
+struct qseecom_load_lib_image_64bit_ireq {
uint32_t qsee_cmd_id;
uint32_t mdt_len;
uint32_t img_len;
uint64_t phy_addr;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_unload_lib_image_ireq {
+struct qseecom_unload_lib_image_ireq {
uint32_t qsee_cmd_id;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_register_listener_ireq {
+struct qseecom_register_listener_ireq {
uint32_t qsee_cmd_id;
uint32_t listener_id;
uint32_t sb_ptr;
uint32_t sb_len;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_register_listener_64bit_ireq {
+struct qseecom_register_listener_64bit_ireq {
uint32_t qsee_cmd_id;
uint32_t listener_id;
uint64_t sb_ptr;
uint32_t sb_len;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_unregister_listener_ireq {
+struct qseecom_unregister_listener_ireq {
uint32_t qsee_cmd_id;
uint32_t listener_id;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_client_send_data_ireq {
+struct qseecom_client_send_data_ireq {
uint32_t qsee_cmd_id;
uint32_t app_id;
uint32_t req_ptr;
@@ -189,9 +189,9 @@
uint32_t rsp_len;
uint32_t sglistinfo_ptr;
uint32_t sglistinfo_len;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_client_send_data_64bit_ireq {
+struct qseecom_client_send_data_64bit_ireq {
uint32_t qsee_cmd_id;
uint32_t app_id;
uint64_t req_ptr;
@@ -200,36 +200,36 @@
uint32_t rsp_len;
uint64_t sglistinfo_ptr;
uint32_t sglistinfo_len;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_reg_log_buf_ireq {
+struct qseecom_reg_log_buf_ireq {
uint32_t qsee_cmd_id;
uint32_t phy_addr;
uint32_t len;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_reg_log_buf_64bit_ireq {
+struct qseecom_reg_log_buf_64bit_ireq {
uint32_t qsee_cmd_id;
uint64_t phy_addr;
uint32_t len;
-};
+} __attribute__((__packed__));
/* send_data resp */
-__packed struct qseecom_client_listener_data_irsp {
+struct qseecom_client_listener_data_irsp {
uint32_t qsee_cmd_id;
uint32_t listener_id;
uint32_t status;
uint32_t sglistinfo_ptr;
uint32_t sglistinfo_len;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_client_listener_data_64bit_irsp {
+struct qseecom_client_listener_data_64bit_irsp {
uint32_t qsee_cmd_id;
uint32_t listener_id;
uint32_t status;
uint64_t sglistinfo_ptr;
uint32_t sglistinfo_len;
-};
+} __attribute__((__packed__));
/*
* struct qseecom_command_scm_resp - qseecom response buffer
@@ -238,40 +238,40 @@
* buffer
* @sb_in_rsp_len: length of command response
*/
-__packed struct qseecom_command_scm_resp {
+struct qseecom_command_scm_resp {
uint32_t result;
enum qseecom_command_scm_resp_type resp_type;
unsigned int data;
-};
+} __attribute__((__packed__));
struct qseecom_rpmb_provision_key {
uint32_t key_type;
};
-__packed struct qseecom_client_send_service_ireq {
+struct qseecom_client_send_service_ireq {
uint32_t qsee_cmd_id;
uint32_t key_type; /* in */
unsigned int req_len; /* in */
uint32_t rsp_ptr; /* in/out */
unsigned int rsp_len; /* in/out */
-};
+} __attribute__((__packed__));
-__packed struct qseecom_client_send_service_64bit_ireq {
+struct qseecom_client_send_service_64bit_ireq {
uint32_t qsee_cmd_id;
uint32_t key_type;
unsigned int req_len;
uint64_t rsp_ptr;
unsigned int rsp_len;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_key_generate_ireq {
+struct qseecom_key_generate_ireq {
uint32_t qsee_command_id;
uint32_t flags;
uint8_t key_id[QSEECOM_KEY_ID_SIZE];
uint8_t hash32[QSEECOM_HASH_SIZE];
-};
+} __attribute__((__packed__));
-__packed struct qseecom_key_select_ireq {
+struct qseecom_key_select_ireq {
uint32_t qsee_command_id;
uint32_t ce;
uint32_t pipe;
@@ -279,33 +279,33 @@
uint32_t flags;
uint8_t key_id[QSEECOM_KEY_ID_SIZE];
uint8_t hash32[QSEECOM_HASH_SIZE];
-};
+} __attribute__((__packed__));
-__packed struct qseecom_key_delete_ireq {
+struct qseecom_key_delete_ireq {
uint32_t qsee_command_id;
uint32_t flags;
uint8_t key_id[QSEECOM_KEY_ID_SIZE];
uint8_t hash32[QSEECOM_HASH_SIZE];
-};
+} __attribute__((__packed__));
-__packed struct qseecom_key_userinfo_update_ireq {
+struct qseecom_key_userinfo_update_ireq {
uint32_t qsee_command_id;
uint32_t flags;
uint8_t key_id[QSEECOM_KEY_ID_SIZE];
uint8_t current_hash32[QSEECOM_HASH_SIZE];
uint8_t new_hash32[QSEECOM_HASH_SIZE];
-};
+} __attribute__((__packed__));
-__packed struct qseecom_key_max_count_query_ireq {
+struct qseecom_key_max_count_query_ireq {
uint32_t flags;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_key_max_count_query_irsp {
+struct qseecom_key_max_count_query_irsp {
uint32_t max_key_count;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_qteec_ireq {
+struct qseecom_qteec_ireq {
uint32_t qsee_cmd_id;
uint32_t app_id;
uint32_t req_ptr;
@@ -314,9 +314,9 @@
uint32_t resp_len;
uint32_t sglistinfo_ptr;
uint32_t sglistinfo_len;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_qteec_64bit_ireq {
+struct qseecom_qteec_64bit_ireq {
uint32_t qsee_cmd_id;
uint32_t app_id;
uint64_t req_ptr;
@@ -325,21 +325,20 @@
uint32_t resp_len;
uint64_t sglistinfo_ptr;
uint32_t sglistinfo_len;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_client_send_fsm_key_req {
+struct qseecom_client_send_fsm_key_req {
uint32_t qsee_cmd_id;
uint32_t req_ptr;
uint32_t req_len;
uint32_t rsp_ptr;
uint32_t rsp_len;
-};
+} __attribute__((__packed__));
-__packed struct qseecom_continue_blocked_request_ireq {
+struct qseecom_continue_blocked_request_ireq {
uint32_t qsee_cmd_id;
uint32_t app_or_session_id; /*legacy: app_id; smcinvoke: session_id*/
-};
-
+} __attribute__((__packed__));
/********** ARMV8 SMC INTERFACE TZ MACRO *******************/