platform: msm_shared: Fix compilation warnings in msm shared drivers.
Fix compilation warnings in shared drivers.
Change-Id: I7c73b60c4a9a38436ea0da5290fc0c9d5ebfa045
diff --git a/platform/msm_shared/board.c b/platform/msm_shared/board.c
index 39072aa..a2ea734 100644
--- a/platform/msm_shared/board.c
+++ b/platform/msm_shared/board.c
@@ -41,7 +41,8 @@
HW_PLATFORM_SUBTYPE_UNKNOWN,
LINUX_MACHTYPE_UNKNOWN,
BASEBAND_MSM,
- {{PMIC_IS_INVALID, 0}, {PMIC_IS_INVALID, 0}, {PMIC_IS_INVALID, 0}},
+ {{PMIC_IS_INVALID, 0, 0}, {PMIC_IS_INVALID, 0, 0},
+ {PMIC_IS_INVALID, 0, 0}},
0,
};
diff --git a/platform/msm_shared/boot_device.c b/platform/msm_shared/boot_device.c
index c120b6c..ac29dac 100644
--- a/platform/msm_shared/boot_device.c
+++ b/platform/msm_shared/boot_device.c
@@ -69,9 +69,7 @@
void platform_boot_dev_cmdline(char *buf)
{
uint32_t val = 0;
- void *dev;
-
- dev = target_mmc_device();
+ void *dev = target_mmc_device();
val = platform_get_boot_dev();
switch(val)
diff --git a/platform/msm_shared/dev_tree.c b/platform/msm_shared/dev_tree.c
index 32071b5..e6db2b7 100644
--- a/platform/msm_shared/dev_tree.c
+++ b/platform/msm_shared/dev_tree.c
@@ -485,7 +485,7 @@
}
/* free queue's memory */
list_for_every_entry(&dt_entry_queue->node, dt_node_tmp1, dt_node, node) {
- dt_node_tmp2 = dt_node_tmp1->node.prev;
+ dt_node_tmp2 = (struct dt_entry_node *) dt_node_tmp1->node.prev;
dt_entry_list_delete(dt_node_tmp1);
dt_node_tmp1 = dt_node_tmp2;
}
@@ -690,7 +690,7 @@
dt_node_tmp1->dt_entry_m->pmic_rev[2], dt_node_tmp1->dt_entry_m->pmic_rev[3],
dt_node_tmp1->dt_entry_m->offset, dt_node_tmp1->dt_entry_m->size);
- dt_node_tmp2 = dt_node_tmp1->node.prev;
+ dt_node_tmp2 = (struct dt_entry_node *) dt_node_tmp1->node.prev;
dt_entry_list_delete(dt_node_tmp1);
dt_node_tmp1 = dt_node_tmp2;
delete_current_dt = 0;
@@ -759,7 +759,7 @@
dt_node_tmp1->dt_entry_m->pmic_rev[2], dt_node_tmp1->dt_entry_m->pmic_rev[3],
dt_node_tmp1->dt_entry_m->offset, dt_node_tmp1->dt_entry_m->size);
- dt_node_tmp2 = dt_node_tmp1->node.prev;
+ dt_node_tmp2 = (struct dt_entry_node *) dt_node_tmp1->node.prev;
dt_entry_list_delete(dt_node_tmp1);
dt_node_tmp1 = dt_node_tmp2;
}
@@ -803,7 +803,7 @@
dt_node_tmp1->dt_entry_m->pmic_rev[2], dt_node_tmp1->dt_entry_m->pmic_rev[3],
dt_node_tmp1->dt_entry_m->offset, dt_node_tmp1->dt_entry_m->size);
- dt_node_tmp2 = dt_node_tmp1->node.prev;
+ dt_node_tmp2 = (struct dt_entry_node *) dt_node_tmp1->node.prev;
dt_entry_list_delete(dt_node_tmp1);
dt_node_tmp1 = dt_node_tmp2;
}
@@ -1013,7 +1013,7 @@
list_for_every_entry(&dt_entry_queue->node, dt_node_tmp1, dt_node, node) {
/* free node memory */
- dt_node_tmp2 = dt_node_tmp1->node.prev;
+ dt_node_tmp2 = (struct dt_entry_node *) dt_node_tmp1->node.prev;
dt_entry_list_delete(dt_node_tmp1);
dt_node_tmp1 = dt_node_tmp2;
}
diff --git a/platform/msm_shared/image_verify.c b/platform/msm_shared/image_verify.c
index 1f68b9d..cfdb5b9 100644
--- a/platform/msm_shared/image_verify.c
+++ b/platform/msm_shared/image_verify.c
@@ -29,6 +29,7 @@
#include <certificate.h>
#include <crypto_hash.h>
#include <string.h>
+#include <openssl/err.h>
#include "image_verify.h"
#include "scm.h"
diff --git a/platform/msm_shared/include/boot_device.h b/platform/msm_shared/include/boot_device.h
index ad17f75..c216586 100644
--- a/platform/msm_shared/include/boot_device.h
+++ b/platform/msm_shared/include/boot_device.h
@@ -58,4 +58,6 @@
uint32_t platform_get_boot_dev();
uint32_t platform_boot_dev_isemmc();
void platform_boot_dev_cmdline(char *buf);
+
+void *target_mmc_device();
#endif
diff --git a/platform/msm_shared/include/clock.h b/platform/msm_shared/include/clock.h
index fd878d2..1369b55 100644
--- a/platform/msm_shared/include/clock.h
+++ b/platform/msm_shared/include/clock.h
@@ -193,4 +193,6 @@
* @action: clock assert or deassert
*/
int clk_reset(struct clk *clk, enum clk_reset_action);
+
+void clock_bumpup_pipe3_clk();
#endif
diff --git a/platform/msm_shared/qmp_usb30_phy.c b/platform/msm_shared/qmp_usb30_phy.c
index b3b3477..40a536a 100644
--- a/platform/msm_shared/qmp_usb30_phy.c
+++ b/platform/msm_shared/qmp_usb30_phy.c
@@ -35,6 +35,7 @@
#include <bits.h>
#include <clock.h>
#include <debug.h>
+#include <qtimer.h>
#define HS_PHY_COMMON_CTRL 0xEC
#define USE_CORECLK BIT(14)
diff --git a/platform/msm_shared/qpic_nand.c b/platform/msm_shared/qpic_nand.c
index efe4188..7cb57bc 100644
--- a/platform/msm_shared/qpic_nand.c
+++ b/platform/msm_shared/qpic_nand.c
@@ -903,7 +903,7 @@
struct cmd_element *cmd_list_read_ptr = ce_read_array;
struct cmd_element *cmd_list_ptr_start = ce_array;
struct cmd_element *cmd_list_read_ptr_start = ce_read_array;
- uint32_t status, nand_ret;
+ uint32_t status;
int num_desc = 0;
uint32_t blk_addr = page / flash.num_pages_per_blk;
@@ -972,7 +972,7 @@
status = qpic_nand_check_status(status);
/* Dummy read to unlock pipe. */
- nand_ret = qpic_nand_read_reg(NAND_FLASH_STATUS, BAM_DESC_UNLOCK_FLAG);
+ qpic_nand_read_reg(NAND_FLASH_STATUS, BAM_DESC_UNLOCK_FLAG);
/* Check for status errors*/
if (status)
diff --git a/platform/msm_shared/qusb2_phy.c b/platform/msm_shared/qusb2_phy.c
index fce33f2..4f2ad47 100644
--- a/platform/msm_shared/qusb2_phy.c
+++ b/platform/msm_shared/qusb2_phy.c
@@ -30,6 +30,7 @@
#include <reg.h>
#include <bits.h>
#include <debug.h>
+#include <qtimer.h>
__WEAK int platform_is_msm8994()
{
diff --git a/platform/msm_shared/scm.c b/platform/msm_shared/scm.c
index 6dc8a00..03b61c9 100644
--- a/platform/msm_shared/scm.c
+++ b/platform/msm_shared/scm.c
@@ -59,7 +59,7 @@
{
uint32_t ret;
scmcall_arg scm_arg = {0};
- scmcall_arg scm_ret = {0};
+ scmcall_ret scm_ret = {0};
/* Make a call to check if SCM call available using new interface,
* if this returns 0 then scm implementation as per arm spec
* otherwise use the old interface for scm calls
@@ -334,8 +334,8 @@
{
scm_arg.x0 = MAKE_SIP_SCM_CMD(SCM_SVC_SSD,SSD_ENCRYPT_ID);
scm_arg.x1 = MAKE_SCM_ARGS(0x2,SMC_PARAM_TYPE_BUFFER_READWRITE,SMC_PARAM_TYPE_VALUE);
- scm_arg.x2 = cmd.img_ptr;
- scm_arg.x3 = cmd.img_len_ptr;
+ scm_arg.x2 = (uint32_t) cmd.img_ptr;
+ scm_arg.x3 = (uint32_t) cmd.img_len_ptr;
ret = scm_call2(&scm_arg, NULL);
}
@@ -423,7 +423,7 @@
scm_arg.x0 = MAKE_SIP_SCM_CMD(SCM_SVC_SSD, SSD_PARSE_MD_ID);
scm_arg.x1 = MAKE_SCM_ARGS(0x2,SMC_PARAM_TYPE_VALUE,SMC_PARAM_TYPE_BUFFER_READWRITE);
scm_arg.x2 = parse_req.md_len;
- scm_arg.x3 = parse_req.md;
+ scm_arg.x3 = (uint32_t) parse_req.md;
ret = scm_call2(&scm_arg, &scm_ret);
parse_rsp.status = scm_ret.x1;
@@ -508,7 +508,7 @@
scm_arg.x2 = decrypt_req.md_ctx_id;
scm_arg.x3 = decrypt_req.last_frag;
scm_arg.x4 = decrypt_req.frag_len;
- scm_arg.x5[0] = decrypt_req.frag;
+ scm_arg.x5[0] = (uint32_t) decrypt_req.frag;
ret = scm_call2(&scm_arg, &scm_ret);
decrypt_rsp.status = scm_ret.x1;
@@ -609,7 +609,7 @@
{
scm_arg.x0 = MAKE_SIP_SCM_CMD(SCM_SVC_SSD, SSD_PROTECT_KEYSTORE_ID);
scm_arg.x1 = MAKE_SCM_ARGS(0x2,SMC_PARAM_TYPE_BUFFER_READWRITE,SMC_PARAM_TYPE_VALUE);
- scm_arg.x2 = protect_req.keystore_ptr;
+ scm_arg.x2 = (uint32_t) protect_req.keystore_ptr;
scm_arg.x3 = protect_req.keystore_len;
ret = scm_call2(&scm_arg, &scm_ret);
@@ -660,7 +660,7 @@
{
scm_arg.x0 = MAKE_SIP_SCM_CMD(SCM_SVC_FUSE, SCM_BLOW_SW_FUSE_ID);
scm_arg.x1 = MAKE_SCM_ARGS(0x2,SMC_PARAM_TYPE_BUFFER_READWRITE,SMC_PARAM_TYPE_VALUE);
- scm_arg.x2 = cmd_buf;
+ scm_arg.x2 = (uint32_t) cmd_buf;
scm_arg.x3 = cmd_len;
scm_call2(&scm_arg, NULL);
@@ -700,7 +700,7 @@
{
scm_arg.x0 = MAKE_SIP_SCM_CMD(SCM_SVC_FUSE, SCM_IS_SW_FUSE_BLOWN_ID);
scm_arg.x1 = MAKE_SCM_ARGS(0x2,SMC_PARAM_TYPE_BUFFER_READWRITE,SMC_PARAM_TYPE_VALUE);
- scm_arg.x2 = cmd_buf;
+ scm_arg.x2 = (uint32_t) cmd_buf;
scm_arg.x3 = cmd_len;
scm_call2(&scm_arg, &scm_ret);
@@ -708,7 +708,6 @@
}
}
-#define SHA256_DIGEST_LENGTH (256/8)
/*
* struct qseecom_save_partition_hash_req
* @partition_id - partition id.
@@ -752,7 +751,7 @@
scm_arg.x0 = MAKE_SIP_SCM_CMD(SCM_SVC_ES, SCM_SAVE_PARTITION_HASH_ID);
scm_arg.x1 = MAKE_SCM_ARGS(0x3, 0, SMC_PARAM_TYPE_BUFFER_READWRITE);
scm_arg.x2 = req.partition_id;
- scm_arg.x3 = (uint8_t *)&req.digest;
+ scm_arg.x3 = (uint32_t) &req.digest;
scm_arg.x4 = sizeof(req.digest);
if (scm_call2(&scm_arg, NULL))
@@ -855,7 +854,7 @@
{
scm_arg.x0 = MAKE_SIP_SCM_CMD(SCM_SVC_MILESTONE_32_64_ID, SCM_SVC_MILESTONE_CMD_ID);
scm_arg.x1 = MAKE_SCM_ARGS(0x2, SMC_PARAM_TYPE_BUFFER_READ);
- scm_arg.x2 = (void *)¶m;
+ scm_arg.x2 = (uint32_t ) ¶m;
scm_arg.x3 = sizeof(el1_system_param);
scm_call2(&scm_arg, NULL);
@@ -892,7 +891,7 @@
{
scm_arg.x0 = MAKE_SIP_SCM_CMD(TZ_SVC_CRYPTO, PRNG_CMD_ID);
scm_arg.x1 = MAKE_SCM_ARGS(0x2,SMC_PARAM_TYPE_BUFFER_READWRITE);
- scm_arg.x2 = (uint8_t *) rbuf;
+ scm_arg.x2 = (uint32_t) rbuf;
scm_arg.x3 = r_len;
ret = scm_call2(&scm_arg, NULL);
diff --git a/platform/msm_shared/smd.c b/platform/msm_shared/smd.c
index a076f65..82874a4 100644
--- a/platform/msm_shared/smd.c
+++ b/platform/msm_shared/smd.c
@@ -249,7 +249,6 @@
arch_invalidate_cache_range((addr_t)response, smd_hdr.pkt_size);
- return response;
}
void smd_signal_read_complete(smd_channel_info_t *ch, uint32_t len)
diff --git a/platform/msm_shared/usb30_dwc.c b/platform/msm_shared/usb30_dwc.c
index d8858b9..a6324a4 100644
--- a/platform/msm_shared/usb30_dwc.c
+++ b/platform/msm_shared/usb30_dwc.c
@@ -879,8 +879,8 @@
{
case DWC_EVENT_EP_CMD_COMPLETE:
{
- dwc_dep_cmd_id_t cmd = DWC_EVENT_EP_EVENT_CMD_TYPE(*event);
- DBG("\n cmd = %s has no action. ignored.", cmd_lookup[cmd]);
+ DBG("\n cmd = %s has no action. ignored.",
+ cmd_lookup[DWC_EVENT_EP_EVENT_CMD_TYPE(*event)]);
}
break;
case DWC_EVENT_EP_XFER_NOT_READY:
@@ -944,8 +944,8 @@
{
case DWC_EVENT_EP_CMD_COMPLETE:
{
- dwc_dep_cmd_id_t cmd = DWC_EVENT_EP_EVENT_CMD_TYPE(*event);
- DBG("\n cmd = %s has no action. ignored.", cmd_lookup[cmd]);
+ DBG("\n cmd = %s has no action. ignored.",
+ cmd_lookup[DWC_EVENT_EP_EVENT_CMD_TYPE(*event)]);
}
break;
case DWC_EVENT_EP_XFER_NOT_READY:
@@ -1208,15 +1208,14 @@
static void dwc_event_handler_ep_bulk_state_inactive(dwc_dev_t *dev,
uint32_t *event)
{
- uint8_t ep_phy_num = DWC_EVENT_EP_EVENT_EP_NUM(*event);
- dwc_dep_cmd_id_t cmd = DWC_EVENT_EP_EVENT_CMD_TYPE(*event);
dwc_event_ep_event_id_t event_id = DWC_EVENT_EP_EVENT_ID(*event);
switch (event_id)
{
case DWC_EVENT_EP_CMD_COMPLETE:
{
- DBG("\n cmd = %s has no action. ignored.", cmd_lookup[cmd]);
+ DBG("\n cmd = %s has no action. ignored.",
+ cmd_lookup[DWC_EVENT_EP_EVENT_CMD_TYPE(*event)]);
}
break;
case DWC_EVENT_EP_XFER_NOT_READY:
diff --git a/platform/msm_shared/usb30_dwc.h b/platform/msm_shared/usb30_dwc.h
index 5a43696..1a69a61 100644
--- a/platform/msm_shared/usb30_dwc.h
+++ b/platform/msm_shared/usb30_dwc.h
@@ -493,6 +493,7 @@
static enum handler_return dwc_irq_handler_ee1(void* arg);
static void dwc_ep_config_init_enable(dwc_dev_t *dev, uint8_t index);
+void dwc_ep_cmd_clear_stall(dwc_dev_t *dev, uint8_t ep_phy_num);
static int dwc_request_queue(dwc_dev_t *dev, uint8_t ep_phy_num, dwc_request_t *req);
#endif