From 0f9c0657affaf720522b2c7167b33225aa8b95f6 Mon Sep 17 00:00:00 2001 From: zhushengle Date: Fri, 18 Mar 2022 11:37:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B5=8C=E5=A5=97?= =?UTF-8?q?=E8=BF=87=E6=B7=B1=E5=92=8C=E5=87=BD=E6=95=B0=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhushengle Change-Id: I228bc8752fb82bced7f97e0529391dac2f1eb65a --- hievent/src/hiview_hievent.c | 10 +++++----- tzdriver/src/smc_smp.c | 10 +++------- tzdriver/src/tc_client_sub_driver.c | 25 +++++++++++++------------ tzdriver/src/tz_spi_notify.c | 26 ++++++++++++++------------ 4 files changed, 35 insertions(+), 36 deletions(-) diff --git a/hievent/src/hiview_hievent.c b/hievent/src/hiview_hievent.c index 60e8707..f5be146 100644 --- a/hievent/src/hiview_hievent.c +++ b/hievent/src/hiview_hievent.c @@ -482,15 +482,15 @@ static int HiviewHieventWriteLogException(char *str, const int strlen) if (leftBufLen > EVENT_INFO_PACK_BUF_LEN) { tempchr = strptr[EVENT_INFO_PACK_BUF_LEN - 1]; strptr[EVENT_INFO_PACK_BUF_LEN - 1] = '\0'; - LogBufToException(0, 0, IDAP_LOGTYPE_CMD, 1, - strptr, EVENT_INFO_PACK_BUF_LEN); + (void)LogBufToException(0, 0, IDAP_LOGTYPE_CMD, 1, + strptr, EVENT_INFO_PACK_BUF_LEN); leftBufLen -= (EVENT_INFO_PACK_BUF_LEN - 1); strptr += (EVENT_INFO_PACK_BUF_LEN - 1); strptr[0] = tempchr; sentcnt++; } else { - LogBufToException(0, 0, IDAP_LOGTYPE_CMD, 0, - strptr, leftBufLen); + (void)LogBufToException(0, 0, IDAP_LOGTYPE_CMD, 0, + strptr, leftBufLen); sentcnt++; break; } @@ -548,6 +548,6 @@ void HiviewHieventFlush(void) { // magic number 0x7BBE69BD for notify hiview to flush hievent file struct HiviewHievent *hievent = HiviewHieventCreate(0x7BBE69BD); - HiviewHieventReport(hievent); + (void)HiviewHieventReport(hievent); HiviewHieventDestroy(hievent); } diff --git a/tzdriver/src/smc_smp.c b/tzdriver/src/smc_smp.c index 1f6800d..2bc6111 100644 --- a/tzdriver/src/smc_smp.c +++ b/tzdriver/src/smc_smp.c @@ -704,10 +704,6 @@ static uint32_t SendSmcCmd(uint32_t cmd, paddr_t cmdAddr, register uint32_t r1 asm("r1") = cmdAddr; register uint32_t r2 asm("r2") = cmdType; register uint32_t r3 asm("r3") = 0; - (void)r0; - (void)r1; - (void)r2; - (void)r3; do { __asm__ volatile( ".ifnc %0, r0;.err;.endif;\n" @@ -742,7 +738,7 @@ int RawSmcSend(uint32_t cmd, paddr_t cmdAddr, void SiqDump(paddr_t mode) { - RawSmcSend(TSP_REE_SIQ, mode, 0, false); + (void)RawSmcSend(TSP_REE_SIQ, mode, 0, false); DoCmdNeedArchivelog(); } @@ -1016,7 +1012,7 @@ void FiqShadowWorkFunc(uint64_t target) { SmcCmdRetT secret = { SMC_EXIT_MAX, 0, target }; - SmpSmcSend(TSP_REQUEST, SMC_OPS_START_FIQSHD, GetCurrentPid(), + (void)SmpSmcSend(TSP_REQUEST, SMC_OPS_START_FIQSHD, GetCurrentPid(), &secret, false); return; } @@ -1430,7 +1426,7 @@ int TcNsSmcWithNoNr(TcNsSmcCmd *cmd) static void SmcWorkNoWait(uint32_t type) { - RawSmcSend(TSP_REQUEST, g_cmdPhys, type, true); + (void)RawSmcSend(TSP_REQUEST, g_cmdPhys, type, true); } static void SmcWorkSetCmdBuffer(struct work_struct *work) diff --git a/tzdriver/src/tc_client_sub_driver.c b/tzdriver/src/tc_client_sub_driver.c index b29ff63..e2fd6e1 100644 --- a/tzdriver/src/tc_client_sub_driver.c +++ b/tzdriver/src/tc_client_sub_driver.c @@ -679,20 +679,21 @@ void DelServiceFromDev(TcNsDevFile *dev, TcNsService *service) return; } for (i = 0; i < SERVICES_MAX_COUNT; i++) { - if (dev->services[i] == service) { - tlogd("dev->serviceRef[%u] = %u\n", i, dev->serviceRef[i]); - if (dev->serviceRef[i] == 0) { - tloge("Caution! No service to be deleted!\n"); - break; - } - dev->serviceRef[i]--; - if (!dev->serviceRef[i]) { - tlogd("del service %u from %u\n", i, dev->devFileId); - dev->services[i] = NULL; - PutServiceStruct(service); - } + if (dev->services[i] != service) { + continue; + } + tlogd("dev->serviceRef[%u] = %u\n", i, dev->serviceRef[i]); + if (dev->serviceRef[i] == 0) { + tloge("Caution! No service to be deleted!\n"); break; } + dev->serviceRef[i]--; + if (!dev->serviceRef[i]) { + tlogd("del service %u from %u\n", i, dev->devFileId); + dev->services[i] = NULL; + PutServiceStruct(service); + } + break; } } diff --git a/tzdriver/src/tz_spi_notify.c b/tzdriver/src/tz_spi_notify.c index 21a7448..b0ce55a 100644 --- a/tzdriver/src/tz_spi_notify.c +++ b/tzdriver/src/tz_spi_notify.c @@ -150,23 +150,25 @@ static DECLARE_WORK(tc_notify_work, TcNotifyFn); static struct workqueue_struct *g_tzSpiWq = NULL; #endif +static void WalkCallback(struct NotifyContextTimer *tcNotifyDataTimer, struct TcNsCallback *callbackFuncT) +{ + if (tcNotifyDataTimer->property.timerClass == TIMER_RTC) { + tlogd("start to call callback func\n"); + callbackFuncT->callbackFunc((void *)(&(tcNotifyDataTimer->property))); + tlogd("end to call callback func\n"); + } else if (tcNotifyDataTimer->property.timerClass == TIMER_GENERIC) { + tlogd("timer60 no callback func\n"); + } +} + static void WalkCallbackList(struct NotifyContextTimer *tcNotifyDataTimer) { struct TcNsCallback *callbackFuncT = NULL; mutex_lock(&g_taCallbackFuncList.callbackListLock); - list_for_each_entry(callbackFuncT, - &g_taCallbackFuncList.callbackList, head) { - if (memcmp(callbackFuncT->uuid, tcNotifyDataTimer->uuid, - UUID_SIZE) == 0) { - if (tcNotifyDataTimer->property.timerClass == TIMER_RTC) { - tlogd("start to call callback func\n"); - callbackFuncT->callbackFunc( - (void *)(&(tcNotifyDataTimer->property))); - tlogd("end to call callback func\n"); - } else if (tcNotifyDataTimer->property.timerClass == TIMER_GENERIC) { - tlogd("timer60 no callback func\n"); - } + list_for_each_entry(callbackFuncT, &g_taCallbackFuncList.callbackList, head) { + if (memcmp(callbackFuncT->uuid, tcNotifyDataTimer->uuid, UUID_SIZE) == 0) { + WalkCallback(tcNotifyDataTimer, callbackFuncT); } } mutex_unlock(&g_taCallbackFuncList.callbackListLock); -- GitLab