intel: Update RSU driver return code

Modify RSU driver error code for backward-compatibility with
Linux RSU driver

Signed-off-by: Abdul Halim, Muhammad Hadi Asyrafi <muhammad.hadi.asyrafi.abdul.halim@intel.com>
Change-Id: Ib9e38d4017efe35d3aceeee27dce451fbd429fb5

diff --git a/plat/intel/soc/common/include/socfpga_sip_svc.h b/plat/intel/soc/common/include/socfpga_sip_svc.h
index 2b1d9837ce77ea5076ab4acea6bbf905e61f62cf..19a52f7b93eb7fbfc7d1bed2b3b02cfb932d15aa 100644 (file)
--- a/plat/intel/soc/common/include/socfpga_sip_svc.h
+++ b/plat/intel/soc/common/include/socfpga_sip_svc.h
@@ -10,9 +10,11 @@
 
 /* SiP status response */
 #define INTEL_SIP_SMC_STATUS_OK                                0
-#define INTEL_SIP_SMC_STATUS_ERROR                     0x4
 #define INTEL_SIP_SMC_STATUS_BUSY                      0x1
 #define INTEL_SIP_SMC_STATUS_REJECTED                  0x2
+#define INTEL_SIP_SMC_STATUS_ERROR                     0x4
+#define INTEL_SIP_SMC_RSU_ERROR                                0x7
+
 
 /* SMC SiP service function identifier */
 #define INTEL_SIP_SMC_FPGA_CONFIG_START                        0xC2000001

diff --git a/plat/intel/soc/common/socfpga_sip_svc.c b/plat/intel/soc/common/socfpga_sip_svc.c
index 1c3d45bee189f8da67b657d26da88f2759f5e1f5..b15fa3d52497e43bc0b9b5dd6d6f10a3d50d8ef3 100644 (file)
--- a/plat/intel/soc/common/socfpga_sip_svc.c
+++ b/plat/intel/soc/common/socfpga_sip_svc.c
@@ -374,7 +374,7 @@ uint64_t intel_rsu_update_address;
 static uint32_t intel_rsu_status(uint64_t *respbuf, uint32_t respbuf_sz)
 {
        if (mailbox_rsu_status((uint32_t *)respbuf, respbuf_sz) < 0)
-               return INTEL_SIP_SMC_STATUS_ERROR;
+               return INTEL_SIP_SMC_RSU_ERROR;
 
        return INTEL_SIP_SMC_STATUS_OK;
 }
@@ -388,7 +388,7 @@ static uint32_t intel_rsu_update(uint64_t update_address)
 static uint32_t intel_rsu_notify(uint64_t execution_stage)
 {
        if (mailbox_hps_stage_notify(execution_stage) < 0)
-               return INTEL_SIP_SMC_STATUS_ERROR;
+               return INTEL_SIP_SMC_RSU_ERROR;
 
        return INTEL_SIP_SMC_STATUS_OK;
 }
@@ -397,7 +397,7 @@ static uint32_t intel_rsu_retry_counter(uint32_t *respbuf, uint32_t respbuf_sz,
                                        uint32_t *ret_stat)
 {
        if (mailbox_rsu_status((uint32_t *)respbuf, respbuf_sz) < 0)
-               return INTEL_SIP_SMC_STATUS_ERROR;
+               return INTEL_SIP_SMC_RSU_ERROR;
 
        *ret_stat = respbuf[8];
        return INTEL_SIP_SMC_STATUS_OK;