Fix verbose messages in SDEI code

Fix mismatches between the format specifier and the corresponding
variable type.

Change-Id: Ib9004bd9baa9ba24a50000bea4f2418e1bf7e743
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>

diff --git a/services/std_svc/sdei/sdei_main.c b/services/std_svc/sdei/sdei_main.c
index d6d092decd0bdee1c31129d22c743b4fbb84b109..28afc1d4be5403fc6e7dcf50712e479d17c7eafe 100644 (file)
--- a/services/std_svc/sdei/sdei_main.c
+++ b/services/std_svc/sdei/sdei_main.c
@@ -932,43 +932,43 @@ uint64_t sdei_smc_handler(uint32_t smc_fid,
        case SDEI_VERSION:
                SDEI_LOG("> VER\n");
                ret = sdei_version();
-               SDEI_LOG("< VER:%lx\n", ret);
+               SDEI_LOG("< VER:%llx\n", ret);
                SMC_RET1(handle, ret);
 
        case SDEI_EVENT_REGISTER:
                x5 = SMC_GET_GP(handle, CTX_GPREG_X5);
-               SDEI_LOG("> REG(n:%d e:%lx a:%lx f:%x m:%lx)\n", (int) x1,
+               SDEI_LOG("> REG(n:%d e:%llx a:%llx f:%x m:%llx)\n", (int) x1,
                                x2, x3, (int) x4, x5);
                ret = sdei_event_register(x1, x2, x3, x4, x5);
-               SDEI_LOG("< REG:%ld\n", ret);
+               SDEI_LOG("< REG:%lld\n", ret);
                SMC_RET1(handle, ret);
 
        case SDEI_EVENT_ENABLE:
                SDEI_LOG("> ENABLE(n:%d)\n", (int) x1);
                ret = sdei_event_enable(x1);
-               SDEI_LOG("< ENABLE:%ld\n", ret);
+               SDEI_LOG("< ENABLE:%lld\n", ret);
                SMC_RET1(handle, ret);
 
        case SDEI_EVENT_DISABLE:
                SDEI_LOG("> DISABLE(n:%d)\n", (int) x1);
                ret = sdei_event_disable(x1);
-               SDEI_LOG("< DISABLE:%ld\n", ret);
+               SDEI_LOG("< DISABLE:%lld\n", ret);
                SMC_RET1(handle, ret);
 
        case SDEI_EVENT_CONTEXT:
                SDEI_LOG("> CTX(p:%d):%lx\n", (int) x1, read_mpidr_el1());
                ret = sdei_event_context(handle, x1);
-               SDEI_LOG("< CTX:%ld\n", ret);
+               SDEI_LOG("< CTX:%lld\n", ret);
                SMC_RET1(handle, ret);
 
        case SDEI_EVENT_COMPLETE_AND_RESUME:
                resume = 1;
 
        case SDEI_EVENT_COMPLETE:
-               SDEI_LOG("> COMPLETE(r:%d sta/ep:%lx):%lx\n", resume, x1,
+               SDEI_LOG("> COMPLETE(r:%d sta/ep:%llx):%lx\n", resume, x1,
                                read_mpidr_el1());
                ret = sdei_event_complete(resume, x1);
-               SDEI_LOG("< COMPLETE:%lx\n", ret);
+               SDEI_LOG("< COMPLETE:%llx\n", ret);
 
                /*
                 * Set error code only if the call failed. If the call
@@ -985,19 +985,19 @@ uint64_t sdei_smc_handler(uint32_t smc_fid,
        case SDEI_EVENT_STATUS:
                SDEI_LOG("> STAT(n:%d)\n", (int) x1);
                ret = sdei_event_status(x1);
-               SDEI_LOG("< STAT:%ld\n", ret);
+               SDEI_LOG("< STAT:%lld\n", ret);
                SMC_RET1(handle, ret);
 
        case SDEI_EVENT_GET_INFO:
                SDEI_LOG("> INFO(n:%d, %d)\n", (int) x1, (int) x2);
                ret = sdei_event_get_info(x1, x2);
-               SDEI_LOG("< INFO:%ld\n", ret);
+               SDEI_LOG("< INFO:%lld\n", ret);
                SMC_RET1(handle, ret);
 
        case SDEI_EVENT_UNREGISTER:
                SDEI_LOG("> UNREG(n:%d)\n", (int) x1);
                ret = sdei_event_unregister(x1);
-               SDEI_LOG("< UNREG:%ld\n", ret);
+               SDEI_LOG("< UNREG:%lld\n", ret);
                SMC_RET1(handle, ret);
 
        case SDEI_PE_UNMASK:
@@ -1009,49 +1009,49 @@ uint64_t sdei_smc_handler(uint32_t smc_fid,
        case SDEI_PE_MASK:
                SDEI_LOG("> MASK:%lx\n", read_mpidr_el1());
                ret = sdei_pe_mask();
-               SDEI_LOG("< MASK:%ld\n", ret);
+               SDEI_LOG("< MASK:%lld\n", ret);
                SMC_RET1(handle, ret);
 
        case SDEI_INTERRUPT_BIND:
                SDEI_LOG("> BIND(%d)\n", (int) x1);
                ret = sdei_interrupt_bind(x1);
-               SDEI_LOG("< BIND:%ld\n", ret);
+               SDEI_LOG("< BIND:%lld\n", ret);
                SMC_RET1(handle, ret);
 
        case SDEI_INTERRUPT_RELEASE:
                SDEI_LOG("> REL(%d)\n", (int) x1);
                ret = sdei_interrupt_release(x1);
-               SDEI_LOG("< REL:%ld\n", ret);
+               SDEI_LOG("< REL:%lld\n", ret);
                SMC_RET1(handle, ret);
 
        case SDEI_SHARED_RESET:
                SDEI_LOG("> S_RESET():%lx\n", read_mpidr_el1());
                ret = sdei_shared_reset();
-               SDEI_LOG("< S_RESET:%ld\n", ret);
+               SDEI_LOG("< S_RESET:%lld\n", ret);
                SMC_RET1(handle, ret);
 
        case SDEI_PRIVATE_RESET:
                SDEI_LOG("> P_RESET():%lx\n", read_mpidr_el1());
                ret = sdei_private_reset();
-               SDEI_LOG("< P_RESET:%ld\n", ret);
+               SDEI_LOG("< P_RESET:%lld\n", ret);
                SMC_RET1(handle, ret);
 
        case SDEI_EVENT_ROUTING_SET:
-               SDEI_LOG("> ROUTE_SET(n:%d f:%lx aff:%lx)\n", (int) x1, x2, x3);
+               SDEI_LOG("> ROUTE_SET(n:%d f:%llx aff:%llx)\n", (int) x1, x2, x3);
                ret = sdei_event_routing_set(x1, x2, x3);
-               SDEI_LOG("< ROUTE_SET:%ld\n", ret);
+               SDEI_LOG("< ROUTE_SET:%lld\n", ret);
                SMC_RET1(handle, ret);
 
        case SDEI_FEATURES:
-               SDEI_LOG("> FTRS(f:%lx)\n", x1);
+               SDEI_LOG("> FTRS(f:%llx)\n", x1);
                ret = sdei_features(x1);
-               SDEI_LOG("< FTRS:%lx\n", ret);
+               SDEI_LOG("< FTRS:%llx\n", ret);
                SMC_RET1(handle, ret);
 
        case SDEI_EVENT_SIGNAL:
-               SDEI_LOG("> SIGNAL(e:%lx t:%lx)\n", x1, x2);
+               SDEI_LOG("> SIGNAL(e:%llx t:%llx)\n", x1, x2);
                ret = sdei_signal(x1, x2);
-               SDEI_LOG("< SIGNAL:%ld\n", ret);
+               SDEI_LOG("< SIGNAL:%lld\n", ret);
                SMC_RET1(handle, ret);
 
        default: