* [PATCH 00/18] Custom debug cleanup @ 2010-02-16 8:42 Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 01/18] DSPBRIDGE: Remove entry point custom debug statements for rmgr Omar Ramirez Luna 2010-02-23 17:53 ` [PATCH 00/18] Custom debug cleanup Omar Ramirez Luna 0 siblings, 2 replies; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna Step 1 to remove custom debug tracing Omar Ramirez Luna (18): DSPBRIDGE: Remove entry point custom debug statements for rmgr DSPBRIDGE: Remove entry point custom debug statements for wmd DSPBRIDGE: Remove entry point custom debug statements for pmgr DSPBRIDGE: Remove entry point custom debug statements for wmd DSPBRIDGE: Remove debug statements for success in rmgr DSPBRIDGE: Remove debug statements for success in wmd DSPBRIDGE: Remove debug statements for success in pmgr DSPBRIDGE: Remove debug statements for success in services DSPBRIDGE: Remove excessive debug statements for rmgr DSPBRIDGE: Remove excessive debug statements for wmd DSPBRIDGE: Remove excessive debug statements for pmgr DSPBRIDGE: Remove excessive debug statements for services DSPBRIDGE: change init statements to pr_info in rmgr DSPBRIDGE: change critical error statements to pr_err in rmgr DSPBRIDGE: change critical error statements to pr_err in wmd DSPBRIDGE: print dsp trace buffer by default DSPBRIDGE: change critical error statements to pr_err in pmgr DSPBRIDGE: change critical error statements to pr_err in services drivers/dsp/bridge/pmgr/chnl.c | 43 +--- drivers/dsp/bridge/pmgr/cmm.c | 87 +------ drivers/dsp/bridge/pmgr/cod.c | 107 ++------- drivers/dsp/bridge/pmgr/dbll.c | 59 +---- drivers/dsp/bridge/pmgr/dev.c | 238 ++---------------- drivers/dsp/bridge/pmgr/dmm.c | 54 +---- drivers/dsp/bridge/pmgr/io.c | 34 +--- drivers/dsp/bridge/pmgr/msg.c | 15 +- drivers/dsp/bridge/pmgr/wcd.c | 139 +---------- drivers/dsp/bridge/rmgr/dbdcd.c | 122 +--------- drivers/dsp/bridge/rmgr/disp.c | 143 +---------- drivers/dsp/bridge/rmgr/drv.c | 166 +++----------- drivers/dsp/bridge/rmgr/drv_interface.c | 62 ++---- drivers/dsp/bridge/rmgr/dspdrv.c | 22 +-- drivers/dsp/bridge/rmgr/mgr.c | 75 +----- drivers/dsp/bridge/rmgr/nldr.c | 57 +---- drivers/dsp/bridge/rmgr/node.c | 295 +++++------------------ drivers/dsp/bridge/rmgr/proc.c | 407 ++++--------------------------- drivers/dsp/bridge/rmgr/rmm.c | 35 +--- drivers/dsp/bridge/rmgr/strm.c | 84 +------ drivers/dsp/bridge/services/cfg.c | 134 ++-------- drivers/dsp/bridge/services/clk.c | 49 +--- drivers/dsp/bridge/services/dbg.c | 4 +- drivers/dsp/bridge/services/mem.c | 51 +---- drivers/dsp/bridge/services/ntfy.c | 4 +- drivers/dsp/bridge/services/reg.c | 10 - drivers/dsp/bridge/services/services.c | 3 - drivers/dsp/bridge/services/sync.c | 151 ++---------- drivers/dsp/bridge/wmd/chnl_sm.c | 37 +--- drivers/dsp/bridge/wmd/io_sm.c | 130 ++--------- drivers/dsp/bridge/wmd/mmu_fault.c | 9 - drivers/dsp/bridge/wmd/tiomap3430.c | 208 +++------------- drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 70 +----- drivers/dsp/bridge/wmd/tiomap_io.c | 58 +---- drivers/dsp/bridge/wmd/tiomap_sm.c | 6 - drivers/dsp/bridge/wmd/ue_deh.c | 29 +-- 36 files changed, 418 insertions(+), 2779 deletions(-) ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 01/18] DSPBRIDGE: Remove entry point custom debug statements for rmgr 2010-02-16 8:42 [PATCH 00/18] Custom debug cleanup Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 02/18] DSPBRIDGE: Remove entry point custom debug statements for wmd Omar Ramirez Luna 2010-02-23 17:53 ` [PATCH 00/18] Custom debug cleanup Omar Ramirez Luna 1 sibling, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna Remove statements using GT_ENTER custom bridge level which is used to print entry and exit points from functions. Only NODE, PROC and STRM meaningful prints were left for reference when migrating to dev_dbg. This changes are split to touch rmgr folder only. As kernel contains ftrace tool no point in having this statements. I.e. from ftrace: cexec.out-440 [000] 1201.767853: bridge_ioctl <-vfs_ioctl cexec.out-440 [000] 1201.767853: WCD_CallDevIOCtl <-bridge_ioctl cexec.out-440 [000] 1201.767883: PROCWRAP_Start <-WCD_CallDevIOCtl cexec.out-440 [000] 1201.767883: PROC_Start <-PROCWRAP_Start Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/rmgr/dbdcd.c | 44 ------------- drivers/dsp/bridge/rmgr/disp.c | 35 ----------- drivers/dsp/bridge/rmgr/drv.c | 102 +++++++------------------------ drivers/dsp/bridge/rmgr/drv_interface.c | 14 ---- drivers/dsp/bridge/rmgr/dspdrv.c | 4 - drivers/dsp/bridge/rmgr/mgr.c | 33 +--------- drivers/dsp/bridge/rmgr/nldr.c | 29 +-------- drivers/dsp/bridge/rmgr/node.c | 49 ++------------- drivers/dsp/bridge/rmgr/proc.c | 74 +--------------------- drivers/dsp/bridge/rmgr/rmm.c | 20 ------ drivers/dsp/bridge/rmgr/strm.c | 28 --------- 11 files changed, 37 insertions(+), 395 deletions(-) diff --git a/drivers/dsp/bridge/rmgr/dbdcd.c b/drivers/dsp/bridge/rmgr/dbdcd.c index 9efb7dc..4e5e7f9 100644 --- a/drivers/dsp/bridge/rmgr/dbdcd.c +++ b/drivers/dsp/bridge/rmgr/dbdcd.c @@ -96,9 +96,6 @@ DSP_STATUS DCD_AutoRegister(IN struct DCD_MANAGER *hDcdMgr, DBC_Require(cRefs > 0); - GT_1trace(curTrace, GT_ENTER, "DCD_AutoRegister: hDcdMgr 0x%x\n", - hDcdMgr); - if (IsValidHandle(hDcdMgr)) { status = DCD_GetObjects(hDcdMgr, pszCoffPath, (DCD_REGISTERFXN)DCD_RegisterObject, @@ -124,9 +121,6 @@ DSP_STATUS DCD_AutoUnregister(IN struct DCD_MANAGER *hDcdMgr, DBC_Require(cRefs > 0); - GT_1trace(curTrace, GT_ENTER, "DCD_AutoUnregister: hDcdMgr 0x%x\n", - hDcdMgr); - if (IsValidHandle(hDcdMgr)) { status = DCD_GetObjects(hDcdMgr, pszCoffPath, (DCD_REGISTERFXN)DCD_RegisterObject, NULL); @@ -155,9 +149,6 @@ DSP_STATUS DCD_CreateManager(IN char *pszZlDllName, DBC_Require(cRefs >= 0); DBC_Require(phDcdMgr); - GT_1trace(curTrace, GT_ENTER, "DCD_CreateManager: phDcdMgr 0x%x\n", - phDcdMgr); - status = COD_Create(&hCodMgr, pszZlDllName, NULL); if (DSP_FAILED(status)) { @@ -211,9 +202,6 @@ DSP_STATUS DCD_DestroyManager(IN struct DCD_MANAGER *hDcdMgr) DBC_Require(cRefs >= 0); - GT_1trace(curTrace, GT_ENTER, "DCD_DestroyManager: hDcdMgr 0x%x\n", - hDcdMgr); - if (IsValidHandle(hDcdMgr)) { /* Delete the COD manager. */ COD_Delete(pDcdMgr->hCodMgr); @@ -252,10 +240,6 @@ DSP_STATUS DCD_EnumerateObject(IN s32 cIndex, IN enum DSP_DCDOBJTYPE objType, DBC_Require(cIndex >= 0); DBC_Require(pUuid != NULL); - GT_3trace(curTrace, GT_ENTER, - "DCD_EnumerateObject: cIndex %d, objType %d, " - " pUuid 0x%x\n", cIndex, objType, pUuid); - if ((cIndex != 0) && (cEnumRefs == 0)) { /* * If an enumeration is being performed on an index greater @@ -346,8 +330,6 @@ void DCD_Exit(void) { DBC_Require(cRefs > 0); - GT_1trace(curTrace, GT_5CLASS, "DCD_Exit: cRefs 0x%x\n", cRefs); - cRefs--; if (cRefs == 0) { COD_Exit(); @@ -372,9 +354,6 @@ DSP_STATUS DCD_GetDepLibs(IN struct DCD_MANAGER *hDcdMgr, DBC_Require(pDepLibUuids != NULL); DBC_Require(pPersistentDepLibs != NULL); - GT_1trace(curTrace, GT_ENTER, "DCD_GetDepLibs: hDcdMgr 0x%x\n", - hDcdMgr); - status = GetDepLibInfo(hDcdMgr, pUuid, &numLibs, NULL, pDepLibUuids, pPersistentDepLibs, phase); @@ -396,9 +375,6 @@ DSP_STATUS DCD_GetNumDepLibs(IN struct DCD_MANAGER *hDcdMgr, DBC_Require(pNumPersLibs != NULL); DBC_Require(pUuid != NULL); - GT_1trace(curTrace, GT_ENTER, "DCD_GetNumDepLibs: hDcdMgr 0x%x\n", - hDcdMgr); - status = GetDepLibInfo(hDcdMgr, pUuid, pNumLibs, pNumPersLibs, NULL, NULL, phase); @@ -434,10 +410,6 @@ DSP_STATUS DCD_GetObjectDef(IN struct DCD_MANAGER *hDcdMgr, DBC_Require(pObjDef != NULL); DBC_Require(pObjUuid != NULL); - GT_4trace(curTrace, GT_ENTER, - "DCD_GetObjectDef: hDcdMgr 0x%x, " "objUuid" - " 0x%x, objType 0x%x, pObjDef 0x%x\n", hDcdMgr, pObjUuid, - objType, pObjDef); szUuid = (char *)MEM_Calloc(MAXUUIDLEN, MEM_PAGED); if (!szUuid) { status = DSP_EMEMORY; @@ -592,8 +564,6 @@ DSP_STATUS DCD_GetObjects(IN struct DCD_MANAGER *hDcdMgr, IN char *pszCoffPath, s32 cObjectType; DBC_Require(cRefs > 0); - GT_1trace(curTrace, GT_ENTER, - "DCD_GetObjects: hDcdMgr 0x%x\n", hDcdMgr); if (!IsValidHandle(hDcdMgr)) { status = DSP_EHANDLE; GT_0trace(curTrace, GT_6CLASS, @@ -824,9 +794,6 @@ bool DCD_Init(void) DBC_Require(cRefs >= 0); - GT_1trace(curTrace, GT_ENTER, "DCD_Init: (on enter) cRefs = 0x%x\n", - cRefs); - if (cRefs == 0) { /* Initialize required modules. */ fInitCOD = COD_Init(); @@ -843,10 +810,6 @@ bool DCD_Init(void) if (fInit) cRefs++; - - GT_1trace(curTrace, GT_5CLASS, "DCD_Init: (on exit) cRefs = 0x%x\n", - cRefs); - DBC_Ensure((fInit && (cRefs > 0)) || (!fInit && (cRefs == 0))); return fInit; @@ -975,10 +938,6 @@ DSP_STATUS DCD_UnregisterObject(IN struct DSP_UUID *pUuid, (objType == DSP_DCDEXECUTELIBTYPE) || (objType == DSP_DCDDELETELIBTYPE)); - GT_2trace(curTrace, GT_ENTER, - "DCD_UnregisterObject: object UUID 0x%x, " - "objType %d\n", pUuid, objType); - /* * When DCD_RegisterObject is called with NULL as pathname, * it indicates an unregister object operation. @@ -1430,9 +1389,6 @@ static DSP_STATUS GetDepLibInfo(IN struct DCD_MANAGER *hDcdMgr, DBC_Require(pNumLibs != NULL); DBC_Require(pUuid != NULL); - GT_1trace(curTrace, GT_ENTER, "DCD_GetNumDepLibs: hDcdMgr 0x%x\n", - hDcdMgr); - /* Initialize to 0 dependent libraries, if only counting number of * dependent libraries */ if (!fGetUuids) { diff --git a/drivers/dsp/bridge/rmgr/disp.c b/drivers/dsp/bridge/rmgr/disp.c index e53b11f..ac2af3c 100644 --- a/drivers/dsp/bridge/rmgr/disp.c +++ b/drivers/dsp/bridge/rmgr/disp.c @@ -113,10 +113,6 @@ DSP_STATUS DISP_Create(OUT struct DISP_OBJECT **phDispObject, DBC_Require(pDispAttrs != NULL); DBC_Require(hDevObject != NULL); - GT_3trace(DISP_DebugMask, GT_ENTER, "DISP_Create: phDispObject: 0x%x\t" - "hDevObject: 0x%x\tpDispAttrs: 0x%x\n", phDispObject, - hDevObject, pDispAttrs); - *phDispObject = NULL; /* Allocate Node Dispatcher object */ @@ -221,9 +217,6 @@ void DISP_Delete(struct DISP_OBJECT *hDisp) DBC_Require(cRefs > 0); DBC_Require(MEM_IsValidHandle(hDisp, DISP_SIGNATURE)); - GT_1trace(DISP_DebugMask, GT_ENTER, - "DISP_Delete: hDisp: 0x%x\n", hDisp); - DeleteDisp(hDisp); DBC_Ensure(!MEM_IsValidHandle(hDisp, DISP_SIGNATURE)); @@ -239,9 +232,6 @@ void DISP_Exit(void) cRefs--; - GT_1trace(DISP_DebugMask, GT_5CLASS, - "Entered DISP_Exit, ref count: 0x%x\n", cRefs); - DBC_Ensure(cRefs >= 0); } @@ -263,9 +253,6 @@ bool DISP_Init(void) if (fRetVal) cRefs++; - GT_1trace(DISP_DebugMask, GT_5CLASS, - "DISP_Init(), ref count: 0x%x\n", cRefs); - DBC_Ensure((fRetVal && (cRefs > 0)) || (!fRetVal && (cRefs >= 0))); return fRetVal; } @@ -287,10 +274,6 @@ DSP_STATUS DISP_NodeChangePriority(struct DISP_OBJECT *hDisp, DBC_Require(MEM_IsValidHandle(hDisp, DISP_SIGNATURE)); DBC_Require(hNode != NULL); - GT_5trace(DISP_DebugMask, GT_ENTER, "DISP_NodeChangePriority: hDisp: " - "0x%x\thNode: 0x%x\tulRMSFxn: 0x%x\tnodeEnv: 0x%x\tnPriority\n", - hDisp, hNode, ulRMSFxn, nodeEnv, nPriority); - /* Send message to RMS to change priority */ pCommand = (struct RMS_Command *)(hDisp->pBuf); pCommand->fxn = (RMS_WORD)(ulRMSFxn); @@ -345,11 +328,6 @@ DSP_STATUS DISP_NodeCreate(struct DISP_OBJECT *hDisp, struct NODE_OBJECT *hNode, DBC_Require(NODE_GetType(hNode) != NODE_DEVICE); DBC_Require(pNodeEnv != NULL); - GT_6trace(DISP_DebugMask, GT_ENTER, - "DISP_NodeCreate: hDisp: 0x%x\thNode:" - " 0x%x\tulRMSFxn: 0x%x\tulCreateFxn: 0x%x\tpArgs: 0x%x\tpNodeEnv:" - " 0x%x\n", hDisp, hNode, ulRMSFxn, ulCreateFxn, pArgs, pNodeEnv); - status = DEV_GetDevType(hDisp->hDevObject, &devType); GT_1trace(DISP_DebugMask, GT_6CLASS, "DISP_Create: Creating DISP " @@ -468,10 +446,6 @@ DSP_STATUS DISP_NodeCreate(struct DISP_OBJECT *hDisp, struct NODE_OBJECT *hNode, * that would break the node object's abstraction. */ GetNodeInfo(hNode, &nodeInfo); - GT_2trace(DISP_DebugMask, GT_ENTER, - "uExecutionPriority %x, nPriority %x\n", - nodeInfo.uExecutionPriority, - taskArgs.nPriority); pMoreTaskArgs->priority = nodeInfo.uExecutionPriority; pMoreTaskArgs->stackSize = taskArgs.uStackSize; pMoreTaskArgs->sysstackSize = taskArgs.uSysStackSize; @@ -581,11 +555,6 @@ DSP_STATUS DISP_NodeDelete(struct DISP_OBJECT *hDisp, struct NODE_OBJECT *hNode, DBC_Require(MEM_IsValidHandle(hDisp, DISP_SIGNATURE)); DBC_Require(hNode != NULL); - GT_5trace(DISP_DebugMask, GT_ENTER, - "DISP_NodeDelete: hDisp: 0x%xthNode: " - "0x%x\tulRMSFxn: 0x%x\tulDeleteFxn: 0x%x\tnodeEnv: 0x%x\n", - hDisp, hNode, ulRMSFxn, ulDeleteFxn, nodeEnv); - status = DEV_GetDevType(hDisp->hDevObject, &devType); if (DSP_SUCCEEDED(status)) { @@ -645,10 +614,6 @@ DSP_STATUS DISP_NodeRun(struct DISP_OBJECT *hDisp, struct NODE_OBJECT *hNode, DBC_Require(MEM_IsValidHandle(hDisp, DISP_SIGNATURE)); DBC_Require(hNode != NULL); - GT_5trace(DISP_DebugMask, GT_ENTER, "DISP_NodeRun: hDisp: 0x%xthNode: \ - 0x%x\tulRMSFxn: 0x%x\tulExecuteFxn: 0x%x\tnodeEnv: 0x%x\n", \ - hDisp, hNode, ulRMSFxn, ulExecuteFxn, nodeEnv); - status = DEV_GetDevType(hDisp->hDevObject, &devType); if (DSP_SUCCEEDED(status)) { diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c index 36bab9f..d3c5df8 100644 --- a/drivers/dsp/bridge/rmgr/drv.c +++ b/drivers/dsp/bridge/rmgr/drv.c @@ -89,13 +89,12 @@ DSP_STATUS DRV_InsertNodeResElement(HANDLE hNode, HANDLE hNodeRes, struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt; DSP_STATUS status = DSP_SOK; struct NODE_RES_OBJECT *pTempNodeRes = NULL; - GT_0trace(curTrace, GT_ENTER, "DRV_InsertNodeResElement: 1"); + *pNodeRes = (struct NODE_RES_OBJECT *)MEM_Calloc (1 * sizeof(struct NODE_RES_OBJECT), MEM_PAGED); - if (*pNodeRes == NULL) { - GT_0trace(curTrace, GT_ENTER, "DRV_InsertNodeResElement: 12"); + if (*pNodeRes == NULL) status = DSP_EHANDLE; - } + if (DSP_SUCCEEDED(status)) { (*pNodeRes)->hNode = hNode; if (pCtxt->pNodeList != NULL) { @@ -104,15 +103,11 @@ DSP_STATUS DRV_InsertNodeResElement(HANDLE hNode, HANDLE hNodeRes, pTempNodeRes = pTempNodeRes->next; pTempNodeRes->next = *pNodeRes; - GT_0trace(curTrace, GT_ENTER, - "DRV_InsertNodeResElement: 2"); } else { pCtxt->pNodeList = *pNodeRes; - GT_0trace(curTrace, GT_ENTER, - "DRV_InsertNodeResElement: 3"); } } - GT_0trace(curTrace, GT_ENTER, "DRV_InsertNodeResElement: 4"); + return status; } @@ -149,7 +144,6 @@ static DSP_STATUS DRV_ProcFreeNodeRes(HANDLE hPCtxt) pNodeList = pCtxt->pNodeList; while (pNodeList != NULL) { - GT_0trace(curTrace, GT_ENTER, "DRV_ProcFreeNodeRes: 1"); pNodeRes = pNodeList; pNodeList = pNodeList->next; if (pNodeRes->nodeAllocated) { @@ -194,7 +188,6 @@ DSP_STATUS DRV_InsertDMMResElement(HANDLE hDMMRes, HANDLE hPCtxt) *pDMMRes = (struct DMM_RES_OBJECT *) MEM_Calloc(1 * sizeof(struct DMM_RES_OBJECT), MEM_PAGED); - GT_0trace(curTrace, GT_ENTER, "DRV_InsertDMMResElement: 1"); if (*pDMMRes == NULL) { GT_0trace(curTrace, GT_5CLASS, "DRV_InsertDMMResElement: 2"); status = DSP_EHANDLE; @@ -214,7 +207,7 @@ DSP_STATUS DRV_InsertDMMResElement(HANDLE hDMMRes, HANDLE hPCtxt) "DRV_InsertDMMResElement: 4"); } } - GT_0trace(curTrace, GT_ENTER, "DRV_InsertDMMResElement: 5"); + return status; } @@ -267,7 +260,6 @@ DSP_STATUS DRV_ProcFreeDMMRes(HANDLE hPCtxt) struct DMM_RES_OBJECT *pDMMList = pCtxt->pDMMList; struct DMM_RES_OBJECT *pDMMRes = NULL; - GT_0trace(curTrace, GT_ENTER, "\nDRV_ProcFreeDMMRes: 1\n"); while (pDMMList != NULL) { pDMMRes = pDMMList; pDMMList = pDMMList->next; @@ -316,19 +308,14 @@ DSP_STATUS DRV_GetDMMResElement(u32 pMapAddr, HANDLE hDMMRes, HANDLE hPCtxt) struct DMM_RES_OBJECT *pTempDMM = NULL; pTempDMM = pCtxt->pDMMList; - while ((pTempDMM != NULL) && (pTempDMM->ulDSPAddr != pMapAddr)) { - GT_3trace(curTrace, GT_ENTER, - "DRV_GetDMMResElement: 2 pTempDMM:%x " - "pTempDMM->ulDSPAddr:%x pMapAddr:%x\n", pTempDMM, - pTempDMM->ulDSPAddr, pMapAddr); + while ((pTempDMM != NULL) && (pTempDMM->ulDSPAddr != pMapAddr)) pTempDMM = pTempDMM->next; - } - if (pTempDMM != NULL) { - GT_0trace(curTrace, GT_ENTER, "DRV_GetDMMResElement: 3"); + + if (pTempDMM != NULL) *pDMMRes = pTempDMM; - } else { + else status = DSP_ENOTFOUND; - } GT_0trace(curTrace, GT_ENTER, "DRV_GetDMMResElement: 4"); + return status; } @@ -379,7 +366,6 @@ DSP_STATUS DRV_GetNodeResElement(HANDLE hNode, HANDLE hNodeRes, HANDLE hPCtxt) struct NODE_RES_OBJECT *pTempNode = NULL; pTempNode = pCtxt->pNodeList; - GT_0trace(curTrace, GT_ENTER, "DRV_GetNodeResElement: 1"); while ((pTempNode != NULL) && (pTempNode->hNode != hNode)) { pTempNode2 = pTempNode; pTempNode = pTempNode->next; @@ -405,15 +391,12 @@ DSP_STATUS DRV_ProcInsertSTRMResElement(HANDLE hStreamHandle, HANDLE hSTRMRes, *pSTRMRes = (struct STRM_RES_OBJECT *) MEM_Calloc(1 * sizeof(struct STRM_RES_OBJECT), MEM_PAGED); - if (*pSTRMRes == NULL) { - GT_0trace(curTrace, GT_ENTER, "DRV_InsertSTRMResElement: 2"); + if (*pSTRMRes == NULL) status = DSP_EHANDLE; - } + if (DSP_SUCCEEDED(status)) { (*pSTRMRes)->hStream = hStreamHandle; if (pCtxt->pSTRMList != NULL) { - GT_0trace(curTrace, GT_ENTER, - "DRV_InsertiSTRMResElement: 3"); pTempSTRMRes = pCtxt->pSTRMList; while (pTempSTRMRes->next != NULL) pTempSTRMRes = pTempSTRMRes->next; @@ -421,8 +404,6 @@ DSP_STATUS DRV_ProcInsertSTRMResElement(HANDLE hStreamHandle, HANDLE hSTRMRes, pTempSTRMRes->next = *pSTRMRes; } else { pCtxt->pSTRMList = *pSTRMRes; - GT_0trace(curTrace, GT_ENTER, - "DRV_InsertSTRMResElement: 4"); } } return status; @@ -525,18 +506,15 @@ DSP_STATUS DRV_GetSTRMResElement(HANDLE hStrm, HANDLE hSTRMRes, HANDLE hPCtxt) struct STRM_RES_OBJECT *pTempSTRM = pCtxt->pSTRMList; while ((pTempSTRM != NULL) && (pTempSTRM->hStream != hStrm)) { - GT_0trace(curTrace, GT_ENTER, "DRV_GetSTRMResElement: 2"); pTempSTRM2 = pTempSTRM; pTempSTRM = pTempSTRM->next; } - if (pTempSTRM != NULL) { - GT_0trace(curTrace, GT_ENTER, "DRV_GetSTRMResElement: 3"); + + if (pTempSTRM != NULL) *STRMRes = pTempSTRM; - } else { - GT_0trace(curTrace, GT_ENTER, "DRV_GetSTRMResElement: 4"); + else status = DSP_ENOTFOUND; - } - GT_0trace(curTrace, GT_ENTER, "DRV_GetSTRMResElement: 5"); + return status; } @@ -564,8 +542,7 @@ DSP_STATUS DRV_Create(OUT struct DRV_OBJECT **phDRVObject) DBC_Require(phDRVObject != NULL); DBC_Require(cRefs > 0); - GT_1trace(curTrace, GT_ENTER, "Entering DRV_Create" - " phDRVObject 0x%x\n", phDRVObject); + MEM_AllocObject(pDRVObject, struct DRV_OBJECT, SIGNATURE); if (pDRVObject) { /* Create and Initialize List of device objects */ @@ -612,9 +589,7 @@ DSP_STATUS DRV_Create(OUT struct DRV_OBJECT **phDRVObject) "DRV Object "); } - GT_2trace(curTrace, GT_ENTER, - "Exiting DRV_Create: phDRVObject: 0x%x\tstatus:" - "0x%x\n", phDRVObject, status); + DBC_Ensure(DSP_FAILED(status) || MEM_IsValidHandle(pDRVObject, SIGNATURE)); return status; @@ -629,8 +604,6 @@ void DRV_Exit(void) { DBC_Require(cRefs > 0); - GT_0trace(curTrace, GT_5CLASS, "Entering DRV_Exit \n"); - cRefs--; DBC_Ensure(cRefs >= 0); @@ -649,8 +622,6 @@ DSP_STATUS DRV_Destroy(struct DRV_OBJECT *hDRVObject) DBC_Require(cRefs > 0); DBC_Require(MEM_IsValidHandle(pDRVObject, SIGNATURE)); - GT_1trace(curTrace, GT_ENTER, "Entering DRV_Destroy" - " hDRVObject 0x%x\n", hDRVObject); /* * Delete the List if it exists.Should not come here * as the DRV_RemoveDevObject and the Last DRV_RequestResources @@ -661,9 +632,6 @@ DSP_STATUS DRV_Destroy(struct DRV_OBJECT *hDRVObject) MEM_FreeObject(pDRVObject); /* Update the DRV Object in Registry to be 0 */ (void)CFG_SetObject(0, REG_DRV_OBJECT); - GT_2trace(curTrace, GT_ENTER, - "Exiting DRV_Destroy: hDRVObject: 0x%x\tstatus:" - "0x%x\n", hDRVObject, status); DBC_Ensure(!MEM_IsValidHandle(pDRVObject, SIGNATURE)); return status; } @@ -687,10 +655,7 @@ DSP_STATUS DRV_GetDevObject(u32 uIndex, struct DRV_OBJECT *hDrvObject, DBC_Require(uIndex >= 0); DBC_Require(cRefs > 0); DBC_Assert(!(LST_IsEmpty(pDrvObject->devList))); - GT_3trace(curTrace, GT_ENTER, - "Entered DRV_GetDevObject, args:\n\tuIndex: " - "0x%x\n\thDrvObject: 0x%x\n\tphDevObject: 0x%x\n", - uIndex, hDrvObject, phDevObject); + pDevObject = (struct DEV_OBJECT *)DRV_GetFirstDevObject(); for (i = 0; i < uIndex; i++) { pDevObject = @@ -704,9 +669,7 @@ DSP_STATUS DRV_GetDevObject(u32 uIndex, struct DRV_OBJECT *hDrvObject, GT_0trace(curTrace, GT_7CLASS, "DRV: Could not get the DevObject\n"); } - GT_2trace(curTrace, GT_ENTER, - "Exiting Drv_GetDevObject\n\tstatus: 0x%x\n\t" - "hDevObject: 0x%x\n", status, *phDevObject); + return status; } @@ -823,9 +786,6 @@ DSP_STATUS DRV_Init(void) if (fRetval) cRefs++; - GT_1trace(curTrace, GT_5CLASS, "Entering DRV_Entry crefs 0x%x \n", - cRefs); - DBC_Ensure((fRetval && (cRefs > 0)) || (!fRetval && (cRefs >= 0))); return fRetval; @@ -847,15 +807,8 @@ DSP_STATUS DRV_InsertDevObject(struct DRV_OBJECT *hDRVObject, DBC_Require(MEM_IsValidHandle(pDRVObject, SIGNATURE)); DBC_Assert(pDRVObject->devList); - GT_2trace(curTrace, GT_ENTER, - "Entering DRV_InsertProcObject hDRVObject " - "0x%x\n, hDevObject 0x%x\n", hDRVObject, hDevObject); - LST_PutTail(pDRVObject->devList, (struct list_head *)hDevObject); - GT_1trace(curTrace, GT_ENTER, - "Exiting InsertDevObject status 0x%x\n", status); - DBC_Ensure(DSP_SUCCEEDED(status) && !LST_IsEmpty(pDRVObject->devList)); return status; @@ -881,9 +834,6 @@ DSP_STATUS DRV_RemoveDevObject(struct DRV_OBJECT *hDRVObject, DBC_Require(pDRVObject->devList != NULL); DBC_Require(!LST_IsEmpty(pDRVObject->devList)); - GT_2trace(curTrace, GT_ENTER, - "Entering DRV_RemoveDevObject hDevObject " - "0x%x\n, hDRVObject 0x%x\n", hDevObject, hDRVObject); /* Search list for pProcObject: */ for (pCurElem = LST_First(pDRVObject->devList); pCurElem != NULL; pCurElem = LST_Next(pDRVObject->devList, pCurElem)) { @@ -901,8 +851,7 @@ DSP_STATUS DRV_RemoveDevObject(struct DRV_OBJECT *hDRVObject, } DBC_Ensure((pDRVObject->devList == NULL) || !LST_IsEmpty(pDRVObject->devList)); - GT_1trace(curTrace, GT_ENTER, - "DRV_RemoveDevObject returning 0x%x\n", status); + return status; } @@ -919,7 +868,7 @@ DSP_STATUS DRV_RequestResources(u32 dwContext, u32 *pDevNodeString) DBC_Require(dwContext != 0); DBC_Require(pDevNodeString != NULL); - GT_0trace(curTrace, GT_ENTER, "Entering DRV_RequestResources\n"); + /* * Allocate memory to hold the string. This will live untill * it is freed in the Release resources. Update the driver object @@ -981,8 +930,6 @@ DSP_STATUS DRV_ReleaseResources(u32 dwContext, struct DRV_OBJECT *hDrvObject) struct DRV_OBJECT *pDRVObject = (struct DRV_OBJECT *)hDrvObject; struct DRV_EXT *pszdevNode; - GT_0trace(curTrace, GT_ENTER, "Entering DRV_Release Resources\n"); - if (!(strcmp((char *)((struct DRV_EXT *)dwContext)->szString, "TIOMAP1510"))) { GT_0trace(curTrace, GT_1CLASS, @@ -1040,8 +987,6 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest) DBC_Require(dwContext != 0); - GT_0trace(curTrace, GT_ENTER, "->RequestBridgeResources \n"); - if (!bRequest) { driverExt = (struct DRV_EXT *)dwContext; /* Releasing resources by deleting the registry key */ @@ -1123,7 +1068,6 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest) } else { status = DSP_EMEMORY; } - GT_0trace(curTrace, GT_ENTER, " <- RequestBridgeResources \n"); return status; } dwBuffSize = sizeof(struct CFG_HOSTRES); @@ -1201,8 +1145,6 @@ static DSP_STATUS RequestBridgeResourcesDSP(u32 dwContext, s32 bRequest) DBC_Require(dwContext != 0); - GT_0trace(curTrace, GT_ENTER, "->RequestBridgeResourcesDSP \n"); - dwBuffSize = sizeof(struct CFG_HOSTRES); pResources = MEM_Calloc(dwBuffSize, MEM_NONPAGED); diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c index 1676c78..4a909a9 100644 --- a/drivers/dsp/bridge/rmgr/drv_interface.c +++ b/drivers/dsp/bridge/rmgr/drv_interface.c @@ -269,8 +269,6 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev) GT_set("**=67"); #endif - GT_0trace(driverTrace, GT_ENTER, "-> driver_init\n"); - #ifdef CONFIG_PM /* Initialize the wait queue */ if (!status) { @@ -361,7 +359,6 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev) DBC_Assert(status == 0); DBC_Assert(DSP_SUCCEEDED(initStatus)); - GT_0trace(driverTrace, GT_ENTER, " <- driver_init\n"); return 0; @@ -378,8 +375,6 @@ static int __devexit omap34xx_bridge_remove(struct platform_device *pdev) DSP_STATUS dsp_status = DSP_SOK; HANDLE hDrvObject = NULL; - GT_0trace(driverTrace, GT_ENTER, "-> driver_exit\n"); - dsp_status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT); if (DSP_FAILED(dsp_status)) goto func_cont; @@ -485,8 +480,6 @@ static int bridge_open(struct inode *ip, struct file *filp) int status = 0; struct PROCESS_CONTEXT *pr_ctxt = NULL; - GT_0trace(driverTrace, GT_ENTER, "-> bridge_open\n"); - /* * Allocate a new process context and insert it into global * process context list. @@ -499,7 +492,6 @@ static int bridge_open(struct inode *ip, struct file *filp) filp->private_data = pr_ctxt; - GT_0trace(driverTrace, GT_ENTER, "<- bridge_open\n"); return status; } @@ -512,8 +504,6 @@ static int bridge_release(struct inode *ip, struct file *filp) int status = 0; struct PROCESS_CONTEXT *pr_ctxt; - GT_0trace(driverTrace, GT_ENTER, "-> bridge_release\n"); - if (!filp->private_data) { status = -EIO; goto err; @@ -528,7 +518,6 @@ static int bridge_release(struct inode *ip, struct file *filp) filp->private_data = NULL; err: - GT_0trace(driverTrace, GT_ENTER, "<- bridge_release\n"); return status; } @@ -547,8 +536,6 @@ static long bridge_ioctl(struct file *filp, unsigned int code, return status; #endif - GT_0trace(driverTrace, GT_ENTER, " -> driver_ioctl\n"); - if (!filp->private_data) { status = -EIO; goto err; @@ -572,7 +559,6 @@ static long bridge_ioctl(struct file *filp, unsigned int code, } err: - GT_0trace(driverTrace, GT_ENTER, " <- driver_ioctl\n"); return status; } diff --git a/drivers/dsp/bridge/rmgr/dspdrv.c b/drivers/dsp/bridge/rmgr/dspdrv.c index 9920059..522da73 100644 --- a/drivers/dsp/bridge/rmgr/dspdrv.c +++ b/drivers/dsp/bridge/rmgr/dspdrv.c @@ -61,8 +61,6 @@ u32 DSP_Init(OUT u32 *initStatus) GT_create(&curTrace, "DD"); - GT_0trace(curTrace, GT_ENTER, "Entering DSP_Init \r\n"); - if (!WCD_Init()) { GT_0trace(curTrace, GT_7CLASS, "DSP_Init Failed \n"); goto func_cont; @@ -146,8 +144,6 @@ bool DSP_Deinit(u32 deviceContext) u32 deviceNode; struct MGR_OBJECT *mgrObject = NULL; - GT_0trace(curTrace, GT_ENTER, "Entering DSP_Deinit \r\n"); - while ((deviceNode = DRV_GetFirstDevExtension()) != 0) { (void)DEV_RemoveDevice((struct CFG_DEVNODE *)deviceNode); diff --git a/drivers/dsp/bridge/rmgr/mgr.c b/drivers/dsp/bridge/rmgr/mgr.c index 4562157..1f2fa48 100644 --- a/drivers/dsp/bridge/rmgr/mgr.c +++ b/drivers/dsp/bridge/rmgr/mgr.c @@ -69,9 +69,7 @@ DSP_STATUS MGR_Create(OUT struct MGR_OBJECT **phMgrObject, DBC_Require(phMgrObject != NULL); DBC_Require(cRefs > 0); - GT_1trace(MGR_DebugMask, GT_ENTER, - "Entering MGR_Create phMgrObject 0x%x\n ", - phMgrObject); + MEM_AllocObject(pMgrObject, struct MGR_OBJECT, SIGNATURE); if (pMgrObject) { status = DCD_CreateManager(ZLDLLNAME, &pMgrObject->hDcdMgr); @@ -101,9 +99,7 @@ DSP_STATUS MGR_Create(OUT struct MGR_OBJECT **phMgrObject, GT_0trace(MGR_DebugMask, GT_7CLASS, "MGR_Create DSP_FAILED to allocate memory \n"); } - GT_2trace(MGR_DebugMask, GT_ENTER, - "Exiting MGR_Create: phMgrObject: 0x%x\t" - "status: 0x%x\n", phMgrObject, status); + DBC_Ensure(DSP_FAILED(status) || MEM_IsValidHandle(pMgrObject, SIGNATURE)); return status; @@ -121,8 +117,6 @@ DSP_STATUS MGR_Destroy(struct MGR_OBJECT *hMgrObject) DBC_Require(cRefs > 0); DBC_Require(MEM_IsValidHandle(hMgrObject, SIGNATURE)); - GT_1trace(MGR_DebugMask, GT_ENTER, - "Entering MGR_Destroy hMgrObject 0x%x\n", hMgrObject); /* Free resources */ if (hMgrObject->hDcdMgr) DCD_DestroyManager(hMgrObject->hDcdMgr); @@ -131,10 +125,6 @@ DSP_STATUS MGR_Destroy(struct MGR_OBJECT *hMgrObject) /* Update the Registry with NULL for MGR Object */ (void)CFG_SetObject(0, REG_MGR_OBJECT); - GT_2trace(MGR_DebugMask, GT_ENTER, - "Exiting MGR_Destroy: hMgrObject: 0x%x\t" - "status: 0x%x\n", hMgrObject, status); - DBC_Ensure(DSP_FAILED(status) || !MEM_IsValidHandle(hMgrObject, SIGNATURE)); @@ -161,10 +151,6 @@ DSP_STATUS MGR_EnumNodeInfo(u32 uNode, OUT struct DSP_NDBPROPS *pNDBProps, DBC_Require(uNDBPropsSize >= sizeof(struct DSP_NDBPROPS)); DBC_Require(cRefs > 0); - GT_4trace(MGR_DebugMask, GT_ENTER, "Entered Manager_EnumNodeInfo, " - "args:\n\t uNode: 0x%x\n\tpNDBProps: 0x%x\n\tuNDBPropsSize:" - "0x%x\tpuNumNodes: 0x%x\n", uNode, pNDBProps, - uNDBPropsSize, puNumNodes); *puNumNodes = 0; /* Get The Manager Object from the Registry */ status = CFG_GetObject((u32 *)&pMgrObject, REG_MGR_OBJECT); @@ -213,11 +199,6 @@ DSP_STATUS MGR_EnumNodeInfo(u32 uNode, OUT struct DSP_NDBPROPS *pNDBProps, "Enumeration failure\r\n"); } func_cont: - GT_4trace(MGR_DebugMask, GT_ENTER, - "Exiting Manager_EnumNodeInfo, args:\n\t" - "uNode: 0x%x\n\tpNDBProps: 0x%x\n\tuNDBPropsSize:" - " 0x%x\tuNumNodes: 0x%x\n", uNode, pNDBProps, - uNDBPropsSize, *puNumNodes); DBC_Ensure((DSP_SUCCEEDED(status) && *puNumNodes > 0) || (DSP_FAILED(status) && *puNumNodes == 0)); @@ -254,11 +235,6 @@ DSP_STATUS MGR_EnumProcessorInfo(u32 uProcessor, DBC_Require(uProcessorInfoSize >= sizeof(struct DSP_PROCESSORINFO)); DBC_Require(cRefs > 0); - GT_4trace(MGR_DebugMask, GT_ENTER, - "Entered Manager_EnumProcessorInfo, " - "args:\n\tuProcessor: 0x%x\n\tpProcessorInfo: 0x%x\n\t" - "uProcessorInfoSize: 0x%x\tpuNumProcs: 0x%x\n", uProcessor, - pProcessorInfo, uProcessorInfoSize, puNumProcs); *puNumProcs = 0; status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT); if (DSP_SUCCEEDED(status)) { @@ -372,8 +348,6 @@ void MGR_Exit(void) if (cRefs == 0) DCD_Exit(); - GT_1trace(MGR_DebugMask, GT_5CLASS, - "Entered MGR_Exit, ref count: 0x%x\n", cRefs); DBC_Ensure(cRefs >= 0); } @@ -430,9 +404,6 @@ bool MGR_Init(void) if (fRetval) cRefs++; - - GT_1trace(MGR_DebugMask, GT_5CLASS, - "Entered MGR_Init, ref count: 0x%x\n", cRefs); DBC_Ensure((fRetval && (cRefs > 0)) || (!fRetval && (cRefs >= 0))); return fRetval; diff --git a/drivers/dsp/bridge/rmgr/nldr.c b/drivers/dsp/bridge/rmgr/nldr.c index 8422a2b..71487be 100644 --- a/drivers/dsp/bridge/rmgr/nldr.c +++ b/drivers/dsp/bridge/rmgr/nldr.c @@ -347,10 +347,6 @@ DSP_STATUS NLDR_Allocate(struct NLDR_OBJECT *hNldr, void *pPrivRef, DBC_Require(phNldrNode != NULL); DBC_Require(MEM_IsValidHandle(hNldr, NLDR_SIGNATURE)); - GT_5trace(NLDR_debugMask, GT_ENTER, "NLDR_Allocate(0x%x, 0x%x, 0x%x, " - "0x%x, 0x%x)\n", hNldr, pPrivRef, pNodeProps, phNldrNode, - pfPhaseSplit); - /* Initialize handle in case of failure */ *phNldrNode = NULL; /* Allocate node object */ @@ -472,8 +468,7 @@ DSP_STATUS NLDR_Create(OUT struct NLDR_OBJECT **phNldr, DBC_Require(pAttrs != NULL); DBC_Require(pAttrs->pfnOvly != NULL); DBC_Require(pAttrs->pfnWrite != NULL); - GT_3trace(NLDR_debugMask, GT_ENTER, "NLDR_Create(0x%x, 0x%x, 0x%x)\n", - phNldr, hDevObject, pAttrs); + /* Allocate dynamic loader object */ MEM_AllocObject(pNldr, struct NLDR_OBJECT, NLDR_SIGNATURE); if (pNldr) { @@ -649,7 +644,7 @@ void NLDR_Delete(struct NLDR_OBJECT *hNldr) u16 i; DBC_Require(cRefs > 0); DBC_Require(MEM_IsValidHandle(hNldr, NLDR_SIGNATURE)); - GT_1trace(NLDR_debugMask, GT_ENTER, "NLDR_Delete(0x%x)\n", hNldr); + hNldr->dbllFxns.exitFxn(); if (hNldr->rmm) RMM_delete(hNldr->rmm); @@ -703,9 +698,6 @@ void NLDR_Exit(void) cRefs--; - GT_1trace(NLDR_debugMask, GT_5CLASS, - "Entered NLDR_Exit, ref count: 0x%x\n", cRefs); - if (cRefs == 0) { RMM_exit(); NLDR_debugMask.flags = NULL; @@ -730,8 +722,6 @@ DSP_STATUS NLDR_GetFxnAddr(struct NLDR_NODEOBJECT *hNldrNode, char *pstrFxn, DBC_Require(MEM_IsValidHandle(hNldrNode, NLDR_NODESIGNATURE)); DBC_Require(pulAddr != NULL); DBC_Require(pstrFxn != NULL); - GT_3trace(NLDR_debugMask, GT_ENTER, "NLDR_GetFxnAddr(0x%x, %s, 0x%x)\n", - hNldrNode, pstrFxn, pulAddr); hNldr = hNldrNode->pNldr; /* Called from NODE_Create(), NODE_Delete(), or NODE_Run(). */ @@ -812,8 +802,7 @@ DSP_STATUS NLDR_GetRmmManager(struct NLDR_OBJECT *hNldrObject, DSP_STATUS status = DSP_SOK; struct NLDR_OBJECT *pNldrObject = hNldrObject; DBC_Require(phRmmMgr != NULL); - GT_2trace(NLDR_debugMask, GT_ENTER, "NLDR_GetRmmManager(0x%x, 0x%x)\n", - hNldrObject, phRmmMgr); + if (MEM_IsValidHandle(hNldrObject, NLDR_SIGNATURE)) { *phRmmMgr = pNldrObject->rmm; } else { @@ -823,9 +812,6 @@ DSP_STATUS NLDR_GetRmmManager(struct NLDR_OBJECT *hNldrObject, "NLDR_GetRmmManager:Invalid handle"); } - GT_2trace(NLDR_debugMask, GT_ENTER, "Exit NLDR_GetRmmManager: status " - "0x%x\n\tphRmmMgr: 0x%x\n", status, *phRmmMgr); - DBC_Ensure(DSP_SUCCEEDED(status) || ((phRmmMgr != NULL) && (*phRmmMgr == NULL))); @@ -849,9 +835,6 @@ bool NLDR_Init(void) cRefs++; - GT_1trace(NLDR_debugMask, GT_5CLASS, "NLDR_Init(), ref count: 0x%x\n", - cRefs); - DBC_Ensure(cRefs > 0); return true; } @@ -870,9 +853,6 @@ DSP_STATUS NLDR_Load(struct NLDR_NODEOBJECT *hNldrNode, enum NLDR_PHASE phase) hNldr = hNldrNode->pNldr; - GT_2trace(NLDR_debugMask, GT_ENTER, "NLDR_Load(0x%x, 0x%x)\n", - hNldrNode, phase); - if (hNldrNode->fDynamic) { hNldrNode->phase = phase; @@ -927,8 +907,7 @@ DSP_STATUS NLDR_Unload(struct NLDR_NODEOBJECT *hNldrNode, enum NLDR_PHASE phase) DBC_Require(cRefs > 0); DBC_Require(MEM_IsValidHandle(hNldrNode, NLDR_NODESIGNATURE)); - GT_2trace(NLDR_debugMask, GT_ENTER, "NLDR_Unload(0x%x, 0x%x)\n", - hNldrNode, phase); + if (hNldrNode != NULL) { if (hNldrNode->fDynamic) { if (*hNldrNode->pfPhaseSplit) { diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c index b60d1ed..d974cda 100644 --- a/drivers/dsp/bridge/rmgr/node.c +++ b/drivers/dsp/bridge/rmgr/node.c @@ -724,11 +724,6 @@ DBAPI NODE_AllocMsgBuf(struct NODE_OBJECT *hNode, u32 uSize, DBC_Require(uSize > 0); - GT_4trace(NODE_debugMask, GT_ENTER, - "NODE_AllocMsgBuf: hNode: 0x%x\tuSize:" - " 0x%x\tpAttr: 0x%x\tpBuffer: %d\n", pNode, uSize, pAttr, - pBuffer); - if (!MEM_IsValidHandle(pNode, NODE_SIGNATURE)) status = DSP_EHANDLE; else if (NODE_GetType(pNode) == NODE_DEVICE) @@ -817,9 +812,6 @@ DSP_STATUS NODE_ChangePriority(struct NODE_OBJECT *hNode, s32 nPriority) DBC_Require(cRefs > 0); - GT_2trace(NODE_debugMask, GT_ENTER, "NODE_ChangePriority: " - "hNode: 0x%x\tnPriority: %d\n", hNode, nPriority); - if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE) || !hNode->hNodeMgr) { GT_1trace(NODE_debugMask, GT_7CLASS, "Invalid NODE Handle: 0x%x\n", hNode); @@ -1365,8 +1357,7 @@ DSP_STATUS NODE_CreateMgr(OUT struct NODE_MGR **phNodeMgr, DBC_Require(cRefs > 0); DBC_Require(phNodeMgr != NULL); DBC_Require(hDevObject != NULL); - GT_2trace(NODE_debugMask, GT_ENTER, "NODE_CreateMgr: phNodeMgr: 0x%x\t" - "hDevObject: 0x%x\n", phNodeMgr, hDevObject); + *phNodeMgr = NULL; /* Allocate Node manager object */ MEM_AllocObject(pNodeMgr, struct NODE_MGR, NODEMGR_SIGNATURE); @@ -1637,12 +1628,10 @@ func_cont1: GT_0trace(NODE_debugMask, GT_5CLASS, "\nNODE_Delete12:\n"); DRV_ProcNodeUpdateStatus(nodeRes, false); } - GT_0trace(NODE_debugMask, GT_ENTER, "\nNODE_Delete13:\n "); DeleteNode(hNode, pr_ctxt); GT_0trace(NODE_debugMask, GT_5CLASS, "\nNODE_Delete2:\n "); DRV_RemoveNodeResElement(nodeRes, pr_ctxt); - GT_0trace(NODE_debugMask, GT_ENTER, "\nNODE_Delete3:\n "); /* Exit critical section */ (void)SYNC_LeaveCS(hNodeMgr->hSync); PROC_NotifyClients(hProcessor, DSP_NODESTATECHANGE); @@ -1661,8 +1650,6 @@ DSP_STATUS NODE_DeleteMgr(struct NODE_MGR *hNodeMgr) DBC_Require(cRefs > 0); - GT_1trace(NODE_debugMask, GT_ENTER, "NODE_DeleteMgr: hNodeMgr: 0x%x\n", - hNodeMgr); if (MEM_IsValidHandle(hNodeMgr, NODEMGR_SIGNATURE)) DeleteNodeMgr(hNodeMgr); else @@ -1687,10 +1674,7 @@ DSP_STATUS NODE_EnumNodes(struct NODE_MGR *hNodeMgr, IN DSP_HNODE *aNodeTab, DBC_Require(aNodeTab != NULL || uNodeTabSize == 0); DBC_Require(puNumNodes != NULL); DBC_Require(puAllocated != NULL); - GT_5trace(NODE_debugMask, GT_ENTER, "NODE_EnumNodes: hNodeMgr: 0x%x\t" - "aNodeTab: %d\tuNodeTabSize: 0x%x\tpuNumNodes: 0x%x\t" - "puAllocated\n", hNodeMgr, aNodeTab, uNodeTabSize, puNumNodes, - puAllocated); + if (!MEM_IsValidHandle(hNodeMgr, NODEMGR_SIGNATURE)) { status = DSP_EHANDLE; goto func_end; @@ -1734,9 +1718,6 @@ void NODE_Exit(void) cRefs--; - GT_1trace(NODE_debugMask, GT_5CLASS, - "Entered NODE_Exit, ref count: 0x%x\n", cRefs); - DBC_Ensure(cRefs >= 0); } @@ -1755,8 +1736,7 @@ DSP_STATUS NODE_FreeMsgBuf(struct NODE_OBJECT *hNode, IN u8 *pBuffer, DBC_Require(pBuffer != NULL); DBC_Require(pNode != NULL); DBC_Require(pNode->hXlator != NULL); - GT_3trace(NODE_debugMask, GT_ENTER, "NODE_FreeMsgBuf: hNode: 0x%x\t" - "pBuffer: 0x%x\tpAttr: 0x%x\n", hNode, pBuffer, pAttr); + if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE)) { status = DSP_EHANDLE; goto func_end; @@ -1796,9 +1776,7 @@ DSP_STATUS NODE_GetAttr(struct NODE_OBJECT *hNode, DBC_Require(cRefs > 0); DBC_Require(pAttr != NULL); DBC_Require(uAttrSize >= sizeof(struct DSP_NODEATTR)); - GT_3trace(NODE_debugMask, GT_ENTER, "NODE_GetAttr: hNode: " - "0x%x\tpAttr: 0x%x \tuAttrSize: 0x%x\n", hNode, pAttr, - uAttrSize); + if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE)) { status = DSP_EHANDLE; } else { @@ -1844,9 +1822,7 @@ DSP_STATUS NODE_GetChannelId(struct NODE_OBJECT *hNode, u32 uDir, u32 uIndex, DBC_Require(cRefs > 0); DBC_Require(uDir == DSP_TONODE || uDir == DSP_FROMNODE); DBC_Require(pulId != NULL); - GT_4trace(NODE_debugMask, GT_ENTER, "NODE_GetChannelId: hNode: " - "0x%x\tuDir: %d\tuIndex: %d\tpulId: 0x%x\n", hNode, uDir, - uIndex, pulId); + if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE)) { status = DSP_EHANDLE; return status; @@ -1966,17 +1942,12 @@ DSP_STATUS NODE_GetNldrObj(struct NODE_MGR *hNodeMgr, DSP_STATUS status = DSP_SOK; struct NODE_MGR *pNodeMgr = hNodeMgr; DBC_Require(phNldrObj != NULL); - GT_2trace(NODE_debugMask, GT_ENTER, - "Entered NODE_GetNldrObj, hNodeMgr: " - "0x%x\n\tphNldrObj: 0x%x\n", hNodeMgr, phNldrObj); + if (!MEM_IsValidHandle(hNodeMgr, NODEMGR_SIGNATURE)) status = DSP_EHANDLE; else *phNldrObj = pNodeMgr->hNldr; - GT_2trace(NODE_debugMask, GT_ENTER, - "Exit NODE_GetNldrObj: status 0x%x\n\t" - "phNldrObj: 0x%x\n", status, *phNldrObj); DBC_Ensure(DSP_SUCCEEDED(status) || ((phNldrObj != NULL) && (*phNldrObj == NULL))); return status; @@ -2074,9 +2045,6 @@ bool NODE_Init(void) cRefs++; - GT_1trace(NODE_debugMask, GT_5CLASS, "NODE_Init(), ref count: 0x%x\n", - cRefs); - return true; } @@ -3196,11 +3164,6 @@ DSP_STATUS NODE_GetUUIDProps(DSP_HPROCESSOR hProcessor, goto func_end; } - GT_3trace(NODE_debugMask, GT_ENTER, - "NODE_GetUUIDProps: " "\thProcessor: " - "0x%x\tpNodeId: 0x%x" "\tpNodeProps: 0x%x\n", hProcessor, - pNodeId, pNodeProps); - status = PROC_GetDevObject(hProcessor, &hDevObject); if (hDevObject) { status = DEV_GetNodeManager(hDevObject, &hNodeMgr); diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c index 2ccbc9b..7c0264e 100644 --- a/drivers/dsp/bridge/rmgr/proc.c +++ b/drivers/dsp/bridge/rmgr/proc.c @@ -129,10 +129,6 @@ PROC_Attach(u32 uProcessor, OPTIONAL CONST struct DSP_PROCESSORATTRIN *pAttrIn, DBC_Require(cRefs > 0); DBC_Require(phProcessor != NULL); - GT_3trace(PROC_DebugMask, GT_ENTER, "Entered PROC_Attach, args:\n\t" - "uProcessor: 0x%x\n\tpAttrIn: 0x%x\n\tphProcessor:" - "0x%x\n", uProcessor, pAttrIn, phProcessor); - if (pr_ctxt->hProcessor) { *phProcessor = pr_ctxt->hProcessor; return status; @@ -267,8 +263,6 @@ func_end: MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) || (status == DSP_SALREADYATTACHED && MEM_IsValidHandle(pProcObject, PROC_SIGNATURE))); - GT_2trace(PROC_DebugMask, GT_ENTER, "Exiting PROC_Attach, results:\n\t" - "status: 0x%x\n\thProcessor: 0x%x\n", status, *phProcessor); return status; } @@ -323,9 +317,6 @@ DSP_STATUS PROC_AutoStart(struct CFG_DEVNODE *hDevNode, DBC_Require(hDevNode != NULL); DBC_Require(hDevObject != NULL); - GT_2trace(PROC_DebugMask, GT_ENTER, - "Entered PROC_AutoStart, args:\n\t" - "hDevNode: 0x%x\thDevObject: 0x%x\n", hDevNode, hDevObject); /* Create a Dummy PROC Object */ status = CFG_GetObject((u32 *)&hMgrObject, REG_MGR_OBJECT); if (DSP_FAILED(status)) { @@ -413,8 +404,6 @@ func_cont: hProcObject->g_pszLastCoff = NULL; MEM_FreeObject(hProcObject); func_end: - GT_1trace(PROC_DebugMask, GT_ENTER, - "Exiting PROC_AutoStart, status:0x%x\n", status); return status; } @@ -437,9 +426,6 @@ DSP_STATUS PROC_Ctrl(DSP_HPROCESSOR hProcessor, u32 dwCmd, u32 timeout = 0; DBC_Require(cRefs > 0); - GT_3trace(PROC_DebugMask, GT_ENTER, - "Entered PROC_Ctrl, args:\n\thProcessor:" - " 0x%x\n\tdwCmd: 0x%x\n\targ: 0x%x\n", hProcessor, dwCmd, arg); if (MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { /* intercept PWR deep sleep command */ @@ -477,8 +463,7 @@ DSP_STATUS PROC_Ctrl(DSP_HPROCESSOR hProcessor, u32 dwCmd, GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_Ctrl: InValid Processor Handle \n"); } - GT_1trace(PROC_DebugMask, GT_ENTER, "Exiting PROC_Ctrl, 0x%x\n", - status); + return status; } @@ -494,7 +479,6 @@ DSP_STATUS PROC_Detach(struct PROCESS_CONTEXT *pr_ctxt) struct PROC_OBJECT *pProcObject = NULL; DBC_Require(cRefs > 0); - GT_0trace(PROC_DebugMask, GT_ENTER, "Entered PROC_Detach\n"); pProcObject = (struct PROC_OBJECT *)pr_ctxt->hProcessor; @@ -518,8 +502,7 @@ DSP_STATUS PROC_Detach(struct PROCESS_CONTEXT *pr_ctxt) GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_Detach: InValid Processor Handle \n"); } - GT_1trace(PROC_DebugMask, GT_ENTER, "Exiting PROC_Detach, 0x%x\n", - status); + return status; } @@ -542,11 +525,6 @@ DSP_STATUS PROC_EnumNodes(DSP_HPROCESSOR hProcessor, OUT DSP_HNODE *aNodeTab, DBC_Require(puNumNodes != NULL); DBC_Require(puAllocated != NULL); - GT_5trace(PROC_DebugMask, GT_ENTER, "Entered PROC_EnumNodes, args:\n\t" - "hProcessor: 0x%x\n\taNodeTab: 0x%x\n\tuNodeTabSize: " - " 0x%x\n\t puNumNodes 0x%x\n\t puAllocated: 0x%x\n", - hProcessor, aNodeTab, uNodeTabSize, puNumNodes, - puAllocated); if (MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { if (DSP_SUCCEEDED(DEV_GetNodeManager(pProcObject->hDevObject, &hNodeMgr))) { @@ -562,11 +540,6 @@ DSP_STATUS PROC_EnumNodes(DSP_HPROCESSOR hProcessor, OUT DSP_HNODE *aNodeTab, GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_EnumNodes: " "InValid Processor Handle \n"); } - GT_6trace(PROC_DebugMask, GT_ENTER, "Exit PROC_EnumNodes, args:\n\t" - "hProcessor: 0x%x\n\taNodeTab: 0x%x\n\tuNodeTabSize: " - " 0x%x\n\t puNumNodes 0x%x\n\t puAllocated: 0x%x\n\t " - "status: 0x%x \n", hProcessor, aNodeTab, uNodeTabSize, - puNumNodes, puAllocated, status); return status; } @@ -652,10 +625,6 @@ static DSP_STATUS proc_memory_sync(DSP_HPROCESSOR hProcessor, void *pMpuAddr, struct PROC_OBJECT *pProcObject = (struct PROC_OBJECT *)hProcessor; DBC_Require(cRefs > 0); - GT_5trace(PROC_DebugMask, GT_ENTER, - "Entered %s, args:\n\t" - "hProcessor: 0x%x pMpuAddr: 0x%x ulSize 0x%x, ulFlags 0x%x\n", - __func__, hProcessor, pMpuAddr, ulSize, ulFlags); if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { GT_1trace(PROC_DebugMask, GT_7CLASS, @@ -675,8 +644,6 @@ static DSP_STATUS proc_memory_sync(DSP_HPROCESSOR hProcessor, void *pMpuAddr, up_read(¤t->mm->mmap_sem); err_out: - GT_2trace(PROC_DebugMask, GT_ENTER, - "Leaving %s [0x%x]", __func__, status); return status; } @@ -727,10 +694,6 @@ DSP_STATUS PROC_GetResourceInfo(DSP_HPROCESSOR hProcessor, u32 uResourceType, DBC_Require(pResourceInfo != NULL); DBC_Require(uResourceInfoSize >= sizeof(struct DSP_RESOURCEINFO)); - GT_4trace(PROC_DebugMask, GT_ENTER, "Entered PROC_GetResourceInfo,\n\t" - "hProcessor: 0x%x\n\tuResourceType: 0x%x\n\tpResourceInfo:" - " 0x%x\n\t uResourceInfoSize 0x%x\n", hProcessor, - uResourceType, pResourceInfo, uResourceInfoSize); if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; GT_0trace(PROC_DebugMask, GT_7CLASS, @@ -776,8 +739,6 @@ DSP_STATUS PROC_GetResourceInfo(DSP_HPROCESSOR hProcessor, u32 uResourceType, break; } func_end: - GT_1trace(PROC_DebugMask, GT_ENTER, "Exiting PROC_GetResourceInfo, " - "status 0x%x\n", status); return status; } @@ -796,8 +757,6 @@ void PROC_Exit(void) cRefs--; - GT_1trace(PROC_DebugMask, GT_5CLASS, - "Entered PROC_Exit, ref count:0x%x\n", cRefs); DBC_Ensure(cRefs >= 0); } @@ -848,9 +807,6 @@ DSP_STATUS PROC_GetState(DSP_HPROCESSOR hProcessor, DBC_Require(pProcStatus != NULL); DBC_Require(uStateInfoSize >= sizeof(struct DSP_PROCESSORSTATE)); - GT_3trace(PROC_DebugMask, GT_ENTER, "Entering PROC_GetState, args:\n\t" - "pProcStatus: 0x%x\n\thProcessor: 0x%x\n\t uStateInfoSize" - " 0x%x\n", pProcStatus, hProcessor, uStateInfoSize); if (MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { /* First, retrieve BRD state information */ status = (*pProcObject->pIntfFxns->pfnBrdStatus) @@ -949,8 +905,6 @@ bool PROC_Init(void) if (fRetval) cRefs++; - GT_1trace(PROC_DebugMask, GT_5CLASS, - "Entered PROC_Init, ref count:0x%x\n", cRefs); DBC_Ensure((fRetval && (cRefs > 0)) || (!fRetval && (cRefs >= 0))); return fRetval; @@ -1002,8 +956,6 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc, #ifdef OPT_LOAD_TIME_INSTRUMENTATION do_gettimeofday(&tv1); #endif - GT_2trace(PROC_DebugMask, GT_ENTER, "Entered PROC_Load, args:\n\t" - "hProcessor: 0x%x\taArgv: 0x%x\n", hProcessor, aArgv[0]); /* Call the WMD_BRD_Load Fxn */ if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; @@ -1253,8 +1205,6 @@ func_end: } #endif - GT_1trace(PROC_DebugMask, GT_ENTER, - "Exiting PROC_Load, status: 0x%x\n", status); DBC_Ensure((DSP_SUCCEEDED(status) && pProcObject->sState == PROC_LOADED) || DSP_FAILED(status)); #ifdef OPT_LOAD_TIME_INSTRUMENTATION @@ -1359,12 +1309,6 @@ DSP_STATUS PROC_RegisterNotify(DSP_HPROCESSOR hProcessor, u32 uEventMask, DBC_Require(hNotification != NULL); DBC_Require(cRefs > 0); - GT_4trace(PROC_DebugMask, GT_ENTER, - "Entered PROC_RegisterNotify, args:\n\t" - "hProcessor: 0x%x\n\tuEventMask: 0x%x\n\tuNotifyMask:" - " 0x%x\n\t hNotification 0x%x\n", hProcessor, uEventMask, - uNotifyType, hNotification); - /* Check processor handle */ if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; @@ -1474,8 +1418,6 @@ DSP_STATUS PROC_Start(DSP_HPROCESSOR hProcessor) BRD_STATUS uBrdState; #endif DBC_Require(cRefs > 0); - GT_1trace(PROC_DebugMask, GT_ENTER, "Entered PROC_Start, args:\n\t" - "hProcessor: 0x%x\n", hProcessor); if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; GT_0trace(PROC_DebugMask, GT_7CLASS, @@ -1545,8 +1487,6 @@ func_cont: } #endif func_end: - GT_1trace(PROC_DebugMask, GT_ENTER, - "Exiting PROC_Start, status 0x%x\n", status); DBC_Ensure((DSP_SUCCEEDED(status) && pProcObject->sState == PROC_RUNNING) || DSP_FAILED(status)); return status; @@ -1570,8 +1510,6 @@ DSP_STATUS PROC_Stop(DSP_HPROCESSOR hProcessor) BRD_STATUS uBrdState; DBC_Require(cRefs > 0); - GT_1trace(PROC_DebugMask, GT_ENTER, "Entered PROC_Stop, args:\n\t" - "hProcessor: 0x%x\n", hProcessor); if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; GT_0trace(PROC_DebugMask, GT_7CLASS, @@ -1630,8 +1568,6 @@ DSP_STATUS PROC_Stop(DSP_HPROCESSOR hProcessor) "PROC_Stop Failed to Stop the processor/device \n"); } func_end: - GT_1trace(PROC_DebugMask, GT_ENTER, "Exiting PROC_Stop, status 0x%x\n", - status); return status; } @@ -1763,8 +1699,6 @@ static DSP_STATUS PROC_Monitor(struct PROC_OBJECT *hProcObject) DBC_Require(cRefs > 0); DBC_Require(MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)); - GT_1trace(PROC_DebugMask, GT_ENTER, "Entered PROC_Monitor, args:\n\t" - "hProcessor: 0x%x\n", hProcObject); /* This is needed only when Device is loaded when it is * already 'ACTIVE' */ /* Destory the Node Manager, MSG Manager */ @@ -1795,9 +1729,7 @@ static DSP_STATUS PROC_Monitor(struct PROC_OBJECT *hProcObject) "PROC_Monitor: Processor Could not" "be put in Monitor mode \n"); } - GT_1trace(PROC_DebugMask, GT_ENTER, - "Exiting PROC_Monitor, status 0x%x\n", - status); + #ifdef CONFIG_BRIDGE_DEBUG DBC_Ensure((DSP_SUCCEEDED(status) && uBrdState == BRD_IDLE) || DSP_FAILED(status)); diff --git a/drivers/dsp/bridge/rmgr/rmm.c b/drivers/dsp/bridge/rmgr/rmm.c index fd61220..be8017f 100644 --- a/drivers/dsp/bridge/rmgr/rmm.c +++ b/drivers/dsp/bridge/rmgr/rmm.c @@ -116,10 +116,6 @@ DSP_STATUS RMM_alloc(struct RMM_TargetObj *target, u32 segid, u32 size, DBC_Require(reserve || (target->numSegs > 0)); DBC_Require(cRefs > 0); - GT_6trace(RMM_debugMask, GT_ENTER, - "RMM_alloc(0x%lx, 0x%lx, 0x%lx, 0x%lx, " - "0x%lx, 0x%lx)\n", target, segid, size, align, dspAddr, - reserve); if (!reserve) { if (!allocBlock(target, segid, size, align, dspAddr)) { status = DSP_EMEMORY; @@ -190,10 +186,6 @@ DSP_STATUS RMM_create(struct RMM_TargetObj **pTarget, DBC_Require(pTarget != NULL); DBC_Require(numSegs == 0 || segTab != NULL); - GT_3trace(RMM_debugMask, GT_ENTER, - "RMM_create(0x%lx, 0x%lx, 0x%lx)\n", - pTarget, segTab, numSegs); - /* Allocate DBL target object */ MEM_AllocObject(target, struct RMM_TargetObj, RMM_TARGSIGNATURE); @@ -293,8 +285,6 @@ void RMM_delete(struct RMM_TargetObj *target) DBC_Require(MEM_IsValidHandle(target, RMM_TARGSIGNATURE)); - GT_1trace(RMM_debugMask, GT_ENTER, "RMM_delete(0x%lx)\n", target); - kfree(target->segTab); if (target->ovlyList) { @@ -331,9 +321,6 @@ void RMM_exit(void) cRefs--; - GT_1trace(RMM_debugMask, GT_5CLASS, "RMM_exit() ref count: 0x%x\n", - cRefs); - DBC_Ensure(cRefs >= 0); } @@ -354,9 +341,6 @@ bool RMM_free(struct RMM_TargetObj *target, u32 segid, u32 addr, u32 size, (addr + size) <= (target->segTab[segid].base + target->segTab[segid].length))); - GT_5trace(RMM_debugMask, GT_ENTER, - "RMM_free(0x%lx, 0x%lx, 0x%lx, 0x%lx, " - "0x%lx)\n", target, segid, addr, size, reserved); /* * Free or unreserve memory. */ @@ -402,10 +386,6 @@ bool RMM_init(void) cRefs++; - GT_1trace(RMM_debugMask, GT_5CLASS, - "RMM_init(), ref count: 0x%x\n", - cRefs); - return true; } diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c index 1b24f08..5d74819 100644 --- a/drivers/dsp/bridge/rmgr/strm.c +++ b/drivers/dsp/bridge/rmgr/strm.c @@ -118,9 +118,6 @@ DSP_STATUS STRM_AllocateBuffer(struct STRM_OBJECT *hStrm, u32 uSize, DBC_Require(cRefs > 0); DBC_Require(apBuffer != NULL); - GT_4trace(STRM_debugMask, GT_ENTER, "STRM_AllocateBuffer: hStrm: 0x%x\t" - "uSize: 0x%x\tapBuffer: 0x%x\tuNumBufs: 0x%x\n", - hStrm, uSize, apBuffer, uNumBufs); if (MEM_IsValidHandle(hStrm, STRM_SIGNATURE)) { /* * Allocate from segment specified at time of stream open. @@ -221,8 +218,6 @@ DSP_STATUS STRM_Create(OUT struct STRM_MGR **phStrmMgr, struct DEV_OBJECT *hDev) DBC_Require(phStrmMgr != NULL); DBC_Require(hDev != NULL); - GT_2trace(STRM_debugMask, GT_ENTER, "STRM_Create: phStrmMgr: " - "0x%x\thDev: 0x%x\n", phStrmMgr, hDev); *phStrmMgr = NULL; /* Allocate STRM manager object */ MEM_AllocObject(pStrmMgr, struct STRM_MGR, STRMMGR_SIGNATURE); @@ -270,9 +265,6 @@ void STRM_Delete(struct STRM_MGR *hStrmMgr) DBC_Require(cRefs > 0); DBC_Require(MEM_IsValidHandle(hStrmMgr, STRMMGR_SIGNATURE)); - GT_1trace(STRM_debugMask, GT_ENTER, "STRM_Delete: hStrmMgr: 0x%x\n", - hStrmMgr); - DeleteStrmMgr(hStrmMgr); DBC_Ensure(!MEM_IsValidHandle(hStrmMgr, STRMMGR_SIGNATURE)); @@ -289,9 +281,6 @@ void STRM_Exit(void) cRefs--; - GT_1trace(STRM_debugMask, GT_5CLASS, - "Entered STRM_Exit, ref count: 0x%x\n", cRefs); - DBC_Ensure(cRefs >= 0); } @@ -311,9 +300,6 @@ DSP_STATUS STRM_FreeBuffer(struct STRM_OBJECT *hStrm, u8 **apBuffer, DBC_Require(cRefs > 0); DBC_Require(apBuffer != NULL); - GT_3trace(STRM_debugMask, GT_ENTER, "STRM_FreeBuffer: hStrm: 0x%x\t" - "apBuffer: 0x%x\tuNumBufs: 0x%x\n", hStrm, apBuffer, uNumBufs); - if (!MEM_IsValidHandle(hStrm, STRM_SIGNATURE)) status = DSP_EHANDLE; @@ -355,9 +341,6 @@ DSP_STATUS STRM_GetInfo(struct STRM_OBJECT *hStrm, DBC_Require(pStreamInfo != NULL); DBC_Require(uStreamInfoSize >= sizeof(struct STRM_INFO)); - GT_3trace(STRM_debugMask, GT_ENTER, "STRM_GetInfo: hStrm: 0x%x\t" - "pStreamInfo: 0x%x\tuStreamInfoSize: 0x%x\n", hStrm, - pStreamInfo, uStreamInfoSize); if (!MEM_IsValidHandle(hStrm, STRM_SIGNATURE)) { status = DSP_EHANDLE; } else { @@ -452,9 +435,6 @@ bool STRM_Init(void) if (fRetVal) cRefs++; - GT_1trace(STRM_debugMask, GT_5CLASS, "STRM_Init(), ref count: 0x%x\n", - cRefs); - DBC_Ensure((fRetVal && (cRefs > 0)) || (!fRetVal && (cRefs >= 0))); return fRetVal; @@ -769,10 +749,6 @@ DSP_STATUS STRM_RegisterNotify(struct STRM_OBJECT *hStrm, u32 uEventMask, DBC_Require(cRefs > 0); DBC_Require(hNotification != NULL); - GT_4trace(STRM_debugMask, GT_ENTER, - "STRM_RegisterNotify: hStrm: 0x%x\t" - "uEventMask: 0x%x\tuNotifyType: 0x%x\thNotification: 0x%x\n", - hStrm, uEventMask, uNotifyType, hNotification); if (!MEM_IsValidHandle(hStrm, STRM_SIGNATURE)) { status = DSP_EHANDLE; } else if ((uEventMask & ~((DSP_STREAMIOCOMPLETION) | @@ -816,10 +792,6 @@ DSP_STATUS STRM_Select(IN struct STRM_OBJECT **aStrmTab, u32 nStrms, DBC_Require(pMask != NULL); DBC_Require(nStrms > 0); - GT_4trace(STRM_debugMask, GT_ENTER, - "STRM_Select: aStrmTab: 0x%x \tnStrms: " - "0x%x\tpMask: 0x%x\tuTimeout: 0x%x\n", aStrmTab, - nStrms, pMask, uTimeout); *pMask = 0; for (i = 0; i < nStrms; i++) { if (!MEM_IsValidHandle(aStrmTab[i], STRM_SIGNATURE)) { -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 02/18] DSPBRIDGE: Remove entry point custom debug statements for wmd 2010-02-16 8:42 ` [PATCH 01/18] DSPBRIDGE: Remove entry point custom debug statements for rmgr Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 03/18] DSPBRIDGE: Remove entry point custom debug statements for pmgr Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna Remove statements using GT_ENTER custom bridge level which is used to print entry and exit points from functions. Few meaningful prints were left for reference when migrating to dev_dbg. This changes are split to touch wmd folder only. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/wmd/chnl_sm.c | 10 ------ drivers/dsp/bridge/wmd/io_sm.c | 17 +--------- drivers/dsp/bridge/wmd/mmu_fault.c | 4 -- drivers/dsp/bridge/wmd/tiomap3430.c | 49 ++---------------------------- drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 5 --- drivers/dsp/bridge/wmd/tiomap_io.c | 9 ------ drivers/dsp/bridge/wmd/tiomap_sm.c | 6 ---- drivers/dsp/bridge/wmd/ue_deh.c | 19 ++---------- 8 files changed, 9 insertions(+), 110 deletions(-) diff --git a/drivers/dsp/bridge/wmd/chnl_sm.c b/drivers/dsp/bridge/wmd/chnl_sm.c index 585c004..11e3930 100644 --- a/drivers/dsp/bridge/wmd/chnl_sm.c +++ b/drivers/dsp/bridge/wmd/chnl_sm.c @@ -104,11 +104,6 @@ DSP_STATUS WMD_CHNL_AddIOReq(struct CHNL_OBJECT *hChnl, void *pHostBuf, bool fSchedDPC = false; u16 wMbVal = 0; - DBG_Trace(DBG_ENTER, - "> WMD_CHNL_AddIOReq pChnl %p CHNL_IsOutput %x uChnlType " - "%x Id %d\n", pChnl, CHNL_IsOutput(pChnl->uMode), - pChnl->uChnlType, pChnl->uId); - fIsEOS = (cBytes == 0); /* Validate args */ @@ -239,7 +234,6 @@ func_cont: IO_Schedule(pChnlMgr->hIOMgr); func_end: - DBG_Trace(DBG_ENTER, "< WMD_CHNL_AddIOReq pChnl %p\n", pChnl); return status; } @@ -580,9 +574,6 @@ DSP_STATUS WMD_CHNL_GetIOC(struct CHNL_OBJECT *hChnl, u32 dwTimeOut, struct CHNL_IOC ioc = { NULL, 0, 0, 0, 0 }; u8 *pHostSysBuf = NULL; - DBG_Trace(DBG_ENTER, "> WMD_CHNL_GetIOC pChnl %p CHNL_IsOutput %x " - "uChnlType %x\n", pChnl, CHNL_IsOutput(pChnl->uMode), - pChnl->uChnlType); /* Check args: */ if (pIOC == NULL) { status = DSP_EPOINTER; @@ -716,7 +707,6 @@ func_cont: /* Update User's IOC block: */ *pIOC = ioc; func_end: - DBG_Trace(DBG_ENTER, "< WMD_CHNL_GetIOC pChnl %p\n", pChnl); return status; } diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c index a25cfd6..046300b 100644 --- a/drivers/dsp/bridge/wmd/io_sm.c +++ b/drivers/dsp/bridge/wmd/io_sm.c @@ -876,8 +876,6 @@ static void IO_DispatchChnl(IN struct IO_MGR *pIOMgr, if (!MEM_IsValidHandle(pIOMgr, IO_MGRSIGNATURE)) goto func_end; - DBG_Trace(DBG_LEVEL3, "Entering IO_DispatchChnl \n"); - /* See if there is any data available for transfer */ if (iMode != IO_SERVICE) goto func_end; @@ -898,8 +896,6 @@ static void IO_DispatchMsg(IN struct IO_MGR *pIOMgr, struct MSG_MGR *hMsgMgr) if (!MEM_IsValidHandle(pIOMgr, IO_MGRSIGNATURE)) goto func_end; - DBG_Trace(DBG_LEVEL3, "Entering IO_DispatchMsg \n"); - /* We are performing both input and output processing. */ InputMsg(pIOMgr, hMsgMgr); OutputMsg(pIOMgr, hMsgMgr); @@ -917,8 +913,6 @@ static void IO_DispatchPM(struct work_struct *work) DSP_STATUS status; u32 pArg[2]; - DBG_Trace(DBG_LEVEL7, "IO_DispatchPM: Entering IO_DispatchPM : \n"); - /* Perform Power message processing here */ while (pIOMgr->iQuePowerHead != pIOMgr->iQuePowerTail) { pArg[0] = *(u32 *)&(pIOMgr->dQuePowerMbxVal[pIOMgr-> @@ -988,7 +982,6 @@ void IO_DPC(IN OUT unsigned long pRefData) DEV_GetDehMgr(pIOMgr->hDevObject, &hDehMgr); if (!MEM_IsValidHandle(pChnlMgr, CHNL_MGRSIGNATURE)) goto func_end; - DBG_Trace(DBG_LEVEL7, "Entering IO_DPC(0x%x)\n", pRefData); requested = pIOMgr->dpc_req; serviced = pIOMgr->dpc_sched; @@ -1039,7 +1032,6 @@ irqreturn_t IO_ISR(int irq, IN void *pRefData) if (irq != INT_MAIL_MPU_IRQ || !MEM_IsValidHandle(hIOMgr, IO_MGRSIGNATURE)) return IRQ_NONE; - DBG_Trace(DBG_LEVEL3, "Entering IO_ISR(0x%x)\n", pRefData); /* Call WMD's CHNLSM_ISR() to see if interrupt is ours, and process. */ if (IO_CALLISR(hIOMgr->hWmdContext, &fSchedDPC, &hIOMgr->wIntrVal)) { @@ -1198,8 +1190,6 @@ static void InputChnl(struct IO_MGR *pIOMgr, struct CHNL_OBJECT *pChnl, sm = pIOMgr->pSharedMem; pChnlMgr = pIOMgr->hChnlMgr; - DBG_Trace(DBG_LEVEL3, "> InputChnl\n"); - /* Attempt to perform input */ if (!IO_GetValue(pIOMgr->hWmdContext, struct SHM, sm, inputFull)) goto func_end; @@ -1302,7 +1292,7 @@ static void InputChnl(struct IO_MGR *pIOMgr, struct CHNL_OBJECT *pChnl, NotifyChnlComplete(pChnl, pChirp); } func_end: - DBG_Trace(DBG_LEVEL3, "< InputChnl\n"); + return; } /* @@ -1471,7 +1461,6 @@ static void OutputChnl(struct IO_MGR *pIOMgr, struct CHNL_OBJECT *pChnl, pChnlMgr = pIOMgr->hChnlMgr; sm = pIOMgr->pSharedMem; - DBG_Trace(DBG_LEVEL3, "> OutputChnl\n"); /* Attempt to perform output */ if (IO_GetValue(pIOMgr->hWmdContext, struct SHM, sm, outputFull)) goto func_end; @@ -1535,7 +1524,7 @@ static void OutputChnl(struct IO_MGR *pIOMgr, struct CHNL_OBJECT *pChnl, NTFY_Notify(pChnl->hNtfy, DSP_STREAMDONE); func_end: - DBG_Trace(DBG_LEVEL3, "< OutputChnl\n"); + return; } /* * ======== OutputMsg ======== @@ -1877,8 +1866,6 @@ void PrintDSPDebugTrace(struct IO_MGR *hIOMgr) { u32 ulNewMessageLength = 0, ulGPPCurPointer; - GT_0trace(dsp_trace_mask, GT_ENTER, "Entering PrintDSPDebugTrace\n"); - while (true) { /* Get the DSP current pointer */ ulGPPCurPointer = *(u32 *) (hIOMgr->ulTraceBufferCurrent); diff --git a/drivers/dsp/bridge/wmd/mmu_fault.c b/drivers/dsp/bridge/wmd/mmu_fault.c index 14ca490..a3c8657 100644 --- a/drivers/dsp/bridge/wmd/mmu_fault.c +++ b/drivers/dsp/bridge/wmd/mmu_fault.c @@ -57,12 +57,9 @@ void MMU_FaultDpc(IN unsigned long pRefData) { struct DEH_MGR *hDehMgr = (struct DEH_MGR *)pRefData; - DBG_Trace(DBG_LEVEL1, "MMU_FaultDpc Enter: 0x%x\n", pRefData); - if (hDehMgr) WMD_DEH_Notify(hDehMgr, DSP_MMUFAULT, 0L); - DBG_Trace(DBG_LEVEL1, "MMU_FaultDpc Exit: 0x%x\n", pRefData); } /* @@ -76,7 +73,6 @@ irqreturn_t MMU_FaultIsr(int irq, IN void *pRefData) struct CFG_HOSTRES resources; DSP_STATUS status = DSP_SOK; - DBG_Trace(DBG_LEVEL1, "Entering DEH_DspMmuIsr: 0x%x\n", pRefData); DBC_Require(irq == INT_DSP_MMU_IRQ); DBC_Require(MEM_IsValidHandle(pDehMgr, SIGNATURE)); diff --git a/drivers/dsp/bridge/wmd/tiomap3430.c b/drivers/dsp/bridge/wmd/tiomap3430.c index 7c1f59a..3598c2b 100644 --- a/drivers/dsp/bridge/wmd/tiomap3430.c +++ b/drivers/dsp/bridge/wmd/tiomap3430.c @@ -294,7 +294,6 @@ void WMD_DRV_Entry(OUT struct WMD_DRV_INTERFACE **ppDrvInterface, { DBC_Require(pstrWMDFileName != NULL); - DBG_Trace(DBG_ENTER, "In the WMD_DRV_Entry \n"); IO_SM_init(); /* Initialization of io_sm module */ @@ -322,7 +321,6 @@ static DSP_STATUS WMD_BRD_Monitor(struct WMD_DEV_CONTEXT *hDevContext) u32 temp; enum HW_PwrState_t pwrState; - DBG_Trace(DBG_ENTER, "Board in the monitor state \n"); status = CFG_GetHostResources( (struct CFG_DEVNODE *)DRV_GetFirstDevExtension(), &resources); if (DSP_FAILED(status)) @@ -354,7 +352,6 @@ static DSP_STATUS WMD_BRD_Monitor(struct WMD_DEV_CONTEXT *hDevContext) pDevContext->dwBrdState = BRD_IDLE; } error_return: - DBG_Trace(DBG_LEVEL6, "WMD_BRD_Monitor - End ****** \n"); GetHWRegs(resources.dwPrmBase, resources.dwCmBase); return status; } @@ -373,10 +370,6 @@ static DSP_STATUS WMD_BRD_Read(struct WMD_DEV_CONTEXT *hDevContext, u32 offset; u32 dspBaseAddr = hDevContext->dwDspBaseAddr; - DBG_Trace(DBG_ENTER, "WMD_BRD_Read, pDevContext: 0x%x\n\t\tpbHostBuf:" - " 0x%x\n\t\tdwDSPAddr: 0x%x\n\t\tulNumBytes: 0x%x\n\t\t" - "ulMemType: 0x%x\n", pDevContext, pbHostBuf, - dwDSPAddr, ulNumBytes, ulMemType); if (dwDSPAddr < pDevContext->dwDSPStartAdd) { DBG_Trace(DBG_LEVEL7, "WMD_BRD_Read: DSP address < start address \n "); @@ -410,8 +403,6 @@ static DSP_STATUS WMD_BRD_SetState(struct WMD_DEV_CONTEXT *hDevContext, DSP_STATUS status = DSP_SOK; struct WMD_DEV_CONTEXT *pDevContext = hDevContext; - DBG_Trace(DBG_ENTER, "WMD_BRD_SetState: Board State: 0x%x \n", - ulBrdState); pDevContext->dwBrdState = ulBrdState; return status; } @@ -450,9 +441,6 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, u32 tmpIndex; u32 clkIdIndex = MBX_PM_MAX_RESOURCES; - DBG_Trace(DBG_ENTER, "Entering WMD_BRD_Start:\n hDevContext: 0x%x\n\t " - "dwDSPAddr: 0x%x\n", hDevContext, dwDSPAddr); - /* The device context contains all the mmu setup info from when the * last dsp base image was loaded. The first entry is always * SHMMEM base. */ @@ -780,9 +768,6 @@ static DSP_STATUS WMD_BRD_Stop(struct WMD_DEV_CONTEXT *hDevContext) u32 dspPwrState; DSP_STATUS clk_status; - DBG_Trace(DBG_ENTER, "Entering WMD_BRD_Stop:\nhDevContext: 0x%x\n", - hDevContext); - /* Disable the mail box interrupts */ (void)CHNLSM_DisableInterrupt(pDevContext); @@ -846,7 +831,6 @@ static DSP_STATUS WMD_BRD_Stop(struct WMD_DEV_CONTEXT *hDevContext) memset((u8 *) pPtAttrs->pgInfo, 0x00, (pPtAttrs->L2NumPages * sizeof(struct PageInfo))); } - DBG_Trace(DBG_LEVEL6, "WMD_BRD_Stop - End ****** \n"); HW_RST_Reset(resources.dwPrmBase, HW_RST1_IVA2); HW_RST_Reset(resources.dwPrmBase, HW_RST2_IVA2); HW_RST_Reset(resources.dwPrmBase, HW_RST3_IVA2); @@ -871,9 +855,6 @@ static DSP_STATUS WMD_BRD_Delete(struct WMD_DEV_CONTEXT *hDevContext) struct PgTableAttrs *pPtAttrs; DSP_STATUS clk_status; - DBG_Trace(DBG_ENTER, "Entering WMD_BRD_Delete:\nhDevContext: 0x%x\n", - hDevContext); - /* Disable the mail box interrupts */ (void) CHNLSM_DisableInterrupt(pDevContext); @@ -913,7 +894,6 @@ static DSP_STATUS WMD_BRD_Delete(struct WMD_DEV_CONTEXT *hDevContext) memset((u8 *)pPtAttrs->pgInfo, 0x00, (pPtAttrs->L2NumPages * sizeof(struct PageInfo))); } - DBG_Trace(DBG_LEVEL6, "WMD_BRD_Delete - End ****** \n"); HW_RST_Reset(resources.dwPrmBase, HW_RST1_IVA2); HW_RST_Reset(resources.dwPrmBase, HW_RST2_IVA2); HW_RST_Reset(resources.dwPrmBase, HW_RST3_IVA2); @@ -945,10 +925,6 @@ static DSP_STATUS WMD_BRD_Write(struct WMD_DEV_CONTEXT *hDevContext, DSP_STATUS status = DSP_SOK; struct WMD_DEV_CONTEXT *pDevContext = hDevContext; - DBG_Trace(DBG_ENTER, "WMD_BRD_Write, pDevContext: 0x%x\n\t\t " - "pbHostBuf: 0x%x\n\t\tdwDSPAddr: 0x%x\n\t\tulNumBytes: " - "0x%x\n \t\t ulMemtype: 0x%x\n", pDevContext, pbHostBuf, - dwDSPAddr, ulNumBytes, ulMemType); if (dwDSPAddr < pDevContext->dwDSPStartAdd) { DBG_Trace(DBG_LEVEL7, "WMD_BRD_Write: DSP address < start address \n "); @@ -964,8 +940,6 @@ static DSP_STATUS WMD_BRD_Write(struct WMD_DEV_CONTEXT *hDevContext, ulNumBytes, ulMemType, false); } - DBG_Trace(DBG_ENTER, "WMD_BRD_Write, memcopy : DspLogicAddr=0x%x \n", - pDevContext->dwDspBaseAddr); return status; } @@ -989,9 +963,6 @@ static DSP_STATUS WMD_DEV_Create(OUT struct WMD_DEV_CONTEXT **ppDevContext, u32 pg_tbl_va; u32 align_size; - DBG_Trace(DBG_ENTER, "WMD_DEV_Create, ppDevContext: 0x%x\n\t\t " - "hDevObject: 0x%x\n\t\tpConfig: 0x%x\n\t\tpDspConfig: 0x%x\n", - ppDevContext, hDevObject, pConfig, pDspConfig); /* Allocate and initialize a data structure to contain the mini driver * state, which becomes the context for later calls into this WMD. */ pDevContext = MEM_Calloc(sizeof(struct WMD_DEV_CONTEXT), MEM_NONPAGED); @@ -1177,8 +1148,6 @@ static DSP_STATUS WMD_DEV_Ctrl(struct WMD_DEV_CONTEXT *pDevContext, u32 dwCmd, struct WMDIOCTL_EXTPROC *paExtProc = (struct WMDIOCTL_EXTPROC *)pArgs; s32 ndx; - DBG_Trace(DBG_ENTER, "WMD_DEV_Ctrl, pDevContext: 0x%x\n\t\t dwCmd: " - "0x%x\n\t\tpArgs: 0x%x\n", pDevContext, dwCmd, pArgs); switch (dwCmd) { case WMDIOCTL_CHNLREAD: break; @@ -1245,8 +1214,6 @@ static DSP_STATUS WMD_DEV_Destroy(struct WMD_DEV_CONTEXT *hDevContext) if (!hDevContext) return DSP_EHANDLE; - DBG_Trace(DBG_ENTER, "Entering WMD_DEV_Destroy:n hDevContext ::0x%x\n", - hDevContext); /* first put the device to stop state */ WMD_BRD_Delete(pDevContext); if (pDevContext->pPtAttrs) { @@ -1543,7 +1510,6 @@ func_cont: if (DSP_SUCCEEDED(status)) { status = DSP_SOK; } else { - DBG_Trace(DBG_LEVEL7, "< WMD_BRD_MemMap status %x\n", status); /* * Roll out the mapped pages incase it failed in middle of * mapping @@ -1816,8 +1782,7 @@ static DSP_STATUS PteUpdate(struct WMD_DEV_CONTEXT *hDevContext, u32 pa, DSP_STATUS status = DSP_SOK; u32 pgSize[] = { HW_PAGE_SIZE_16MB, HW_PAGE_SIZE_1MB, HW_PAGE_SIZE_64KB, HW_PAGE_SIZE_4KB }; - DBG_Trace(DBG_ENTER, "> PteUpdate hDevContext %x, pa %x, va %x, " - "size %x, mapAttrs %x\n", hDevContext, pa, va, size, mapAttrs); + while (numBytes && DSP_SUCCEEDED(status)) { /* To find the max. page size with which both PA & VA are * aligned */ @@ -1840,8 +1805,7 @@ static DSP_STATUS PteUpdate(struct WMD_DEV_CONTEXT *hDevContext, u32 pa, } } } - DBG_Trace(DBG_ENTER, "< PteUpdate status %x numBytes %x\n", status, - numBytes); + return status; } @@ -1866,8 +1830,7 @@ static DSP_STATUS PteSet(struct PgTableAttrs *pt, u32 pa, u32 va, u32 L2BasePa = 0; u32 L2PageNum = 0; DSP_STATUS status = DSP_SOK; - DBG_Trace(DBG_ENTER, "> PteSet pPgTableAttrs %x, pa %x, va %x, " - "size %x, attrs %x\n", pt, pa, va, size, attrs); + L1BaseVa = pt->L1BaseVa; pgTblVa = L1BaseVa; if ((size == HW_PAGE_SIZE_64KB) || (size == HW_PAGE_SIZE_4KB)) { @@ -1933,7 +1896,7 @@ static DSP_STATUS PteSet(struct PgTableAttrs *pt, u32 pa, u32 va, attrs->elementSize, attrs->mixedSize); status = HW_MMU_PteSet(pgTblVa, pa, va, size, attrs); } - DBG_Trace(DBG_ENTER, "< PteSet status %x\n", status); + return status; } @@ -1954,9 +1917,6 @@ static DSP_STATUS MemMapVmalloc(struct WMD_DEV_CONTEXT *pDevContext, u32 numOf4KPages; u32 temp = 0; - DBG_Trace(DBG_ENTER, "> MemMapVmalloc hDevContext %x, pa %x, va %x, " - "size %x\n", pDevContext, ulMpuAddr, ulVirtAddr, ulNumBytes); - /* * Do Kernel va to pa translation. * Combine physically contiguous regions to reduce TLBs. @@ -2020,7 +1980,6 @@ static DSP_STATUS MemMapVmalloc(struct WMD_DEV_CONTEXT *pDevContext, * region */ flush_all(pDevContext); - DBG_Trace(DBG_LEVEL7, "< WMD_BRD_MemMap at end status %x\n", status); return status; } diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c index 084f406..193844d 100644 --- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c +++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c @@ -180,8 +180,6 @@ DSP_STATUS SleepDSP(struct WMD_DEV_CONTEXT *pDevContext, IN u32 dwCmd, u16 timeout = PWRSTST_TIMEOUT / 10; enum HW_PwrState_t pwrState, targetPwrState; - DBG_Trace(DBG_LEVEL7, "SleepDSP- Enter function \n"); - /* Check if sleep code is valid */ if ((dwCmd != PWR_DEEPSLEEP) && (dwCmd != PWR_EMERGENCYDEEPSLEEP)) { DBG_Trace(DBG_LEVEL7, "SleepDSP- Illegal sleep command\n"); @@ -350,10 +348,7 @@ DSP_STATUS DSPPeripheralClkCtrl(struct WMD_DEV_CONTEXT *pDevContext, struct CFG_HOSTRES resources; u32 value; - DBG_Trace(DBG_ENTER, "Entering DSPPeripheralClkCtrl \n"); dspPerClksBefore = pDevContext->uDspPerClks; - DBG_Trace(DBG_ENTER, "DSPPeripheralClkCtrl : uDspPerClks = 0x%x \n", - dspPerClksBefore); extClk = (u32)*((u32 *)pArgs); diff --git a/drivers/dsp/bridge/wmd/tiomap_io.c b/drivers/dsp/bridge/wmd/tiomap_io.c index 4e85efd..4b6ee90 100644 --- a/drivers/dsp/bridge/wmd/tiomap_io.c +++ b/drivers/dsp/bridge/wmd/tiomap_io.c @@ -65,12 +65,6 @@ DSP_STATUS ReadExtDspData(struct WMD_DEV_CONTEXT *hDevContext, u32 dwBaseAddr = pDevContext->dwDspExtBaseAddr; bool bTraceRead = false; - DBG_Trace(DBG_ENTER, "ReadExtDspData," - "hDevContext: 0x%x\n\t\tpbHostBuf: 0x%x" - "\n\t\tdwDSPAddr: 0x%x\n\t\tulNumBytes: 0x%x\n\t\t" - "ulMemType: 0x%x\n", pDevContext, pbHostBuf, dwDSPAddr, - ulNumBytes, ulMemType); - if (!ulShmBaseVirt) { status = DEV_GetSymbol(pDevContext->hDevObject, SHMBASENAME, &ulShmBaseVirt); @@ -207,7 +201,6 @@ DSP_STATUS WriteDspData(struct WMD_DEV_CONTEXT *hDevContext, IN u8 *pbHostBuf, base1 = OMAP_DSP_MEM1_SIZE; base2 = OMAP_DSP_MEM2_BASE - OMAP_DSP_MEM1_BASE; base3 = OMAP_DSP_MEM3_BASE - OMAP_DSP_MEM1_BASE; - DBG_Trace(DBG_ENTER, "Entered WriteDspData \n"); status = CFG_GetHostResources( (struct CFG_DEVNODE *)DRV_GetFirstDevExtension(), &resources); @@ -263,8 +256,6 @@ DSP_STATUS WriteExtDspData(struct WMD_DEV_CONTEXT *pDevContext, bTempByte1 = 0x0; bTempByte2 = 0x0; - DBG_Trace(DBG_ENTER, "Entered WriteExtDspData dwDSPAddr 0x%x " - "ulNumBytes 0x%x \n", dwDSPAddr, ulNumBytes); if (bSymbolsReloaded) { /* Check if it is a load to Trace section */ retVal = DEV_GetSymbol(pDevContext->hDevObject, diff --git a/drivers/dsp/bridge/wmd/tiomap_sm.c b/drivers/dsp/bridge/wmd/tiomap_sm.c index b04ed6d..50f54c2 100644 --- a/drivers/dsp/bridge/wmd/tiomap_sm.c +++ b/drivers/dsp/bridge/wmd/tiomap_sm.c @@ -41,8 +41,6 @@ DSP_STATUS CHNLSM_EnableInterrupt(struct WMD_DEV_CONTEXT *pDevContext) struct CFG_HOSTRES resources; u32 devType; - DBG_Trace(DBG_ENTER, "CHNLSM_EnableInterrupt(0x%x)\n", pDevContext); - /* Read the messages in the mailbox until the message queue is empty */ CFG_GetHostResources((struct CFG_DEVNODE *)DRV_GetFirstDevExtension(), @@ -84,8 +82,6 @@ DSP_STATUS CHNLSM_DisableInterrupt(struct WMD_DEV_CONTEXT *pDevContext) { struct CFG_HOSTRES resources; - DBG_Trace(DBG_ENTER, "CHNLSM_DisableInterrupt(0x%x)\n", pDevContext); - CFG_GetHostResources((struct CFG_DEVNODE *)DRV_GetFirstDevExtension(), &resources); HW_MBOX_EventDisable(resources.dwMboxBase, MBOX_DSP2ARM, @@ -171,8 +167,6 @@ bool CHNLSM_ISR(struct WMD_DEV_CONTEXT *pDevContext, bool *pfSchedDPC, u32 numMbxMsg; u32 mbxValue; - DBG_Trace(DBG_ENTER, "CHNLSM_ISR(0x%x)\n", pDevContext); - CFG_GetHostResources((struct CFG_DEVNODE *)DRV_GetFirstDevExtension(), &resources); HW_MBOX_NumMsgGet(resources.dwMboxBase, MBOX_DSP2ARM, &numMbxMsg); diff --git a/drivers/dsp/bridge/wmd/ue_deh.c b/drivers/dsp/bridge/wmd/ue_deh.c index 21d0b48..dd23387 100644 --- a/drivers/dsp/bridge/wmd/ue_deh.c +++ b/drivers/dsp/bridge/wmd/ue_deh.c @@ -72,7 +72,6 @@ DSP_STATUS WMD_DEH_Create(OUT struct DEH_MGR **phDehMgr, struct CFG_DEVNODE *hDevNode; struct WMD_DEV_CONTEXT *hWmdContext = NULL; - DBG_Trace(DBG_LEVEL1, "Entering DEH_Create: 0x%x\n", phDehMgr); /* Message manager will be created when a file is loaded, since * size of message buffer in shared memory is configurable in * the base image. */ @@ -120,7 +119,7 @@ DSP_STATUS WMD_DEH_Create(OUT struct DEH_MGR **phDehMgr, *phDehMgr = (struct DEH_MGR *)pDehMgr; DBG_Trace(DBG_LEVEL1, "ISR_IRQ Object 0x%x \n", pDehMgr); } - DBG_Trace(DBG_LEVEL1, "Exiting DEH_Create.\n"); + return status; } @@ -133,7 +132,6 @@ DSP_STATUS WMD_DEH_Destroy(struct DEH_MGR *hDehMgr) DSP_STATUS status = DSP_SOK; struct DEH_MGR *pDehMgr = (struct DEH_MGR *)hDehMgr; - DBG_Trace(DBG_LEVEL1, "Entering DEH_Destroy: 0x%x\n", pDehMgr); if (MEM_IsValidHandle(pDehMgr, SIGNATURE)) { /* Release dummy VA buffer */ WMD_DEH_ReleaseDummyMem(); @@ -150,7 +148,7 @@ DSP_STATUS WMD_DEH_Destroy(struct DEH_MGR *hDehMgr) /* Deallocate the DEH manager object */ MEM_FreeObject(pDehMgr); } - DBG_Trace(DBG_LEVEL1, "Exiting DEH_Destroy.\n"); + return status; } @@ -165,14 +163,11 @@ DSP_STATUS WMD_DEH_RegisterNotify(struct DEH_MGR *hDehMgr, u32 uEventMask, DSP_STATUS status = DSP_SOK; struct DEH_MGR *pDehMgr = (struct DEH_MGR *)hDehMgr; - DBG_Trace(DBG_LEVEL1, "Entering WMD_DEH_RegisterNotify: 0x%x\n", - pDehMgr); - if (MEM_IsValidHandle(pDehMgr, SIGNATURE)) { status = NTFY_Register(pDehMgr->hNtfy, hNotification, uEventMask, uNotifyType); } - DBG_Trace(DBG_LEVEL1, "Exiting WMD_DEH_RegisterNotify.\n"); + return status; } @@ -200,8 +195,6 @@ void WMD_DEH_Notify(struct DEH_MGR *hDehMgr, u32 ulEventMask, DBG_Trace(DBG_LEVEL7, "**Failed to get Host Resources in MMU ISR **\n"); - DBG_Trace(DBG_LEVEL1, "Entering WMD_DEH_Notify: 0x%x, 0x%x\n", pDehMgr, - ulEventMask); if (MEM_IsValidHandle(pDehMgr, SIGNATURE)) { printk(KERN_INFO "WMD_DEH_Notify: ********** DEVICE EXCEPTION " "**********\n"); @@ -296,8 +289,6 @@ DBG_Trace(DBG_LEVEL6, "WMD_DEH_Notify: DSP_MMUFAULT, " PrintDspTraceBuffer(hDehMgr->hWmdContext); } - DBG_Trace(DBG_LEVEL1, "Exiting WMD_DEH_Notify\n"); - } /* @@ -313,8 +304,6 @@ DSP_STATUS WMD_DEH_GetInfo(struct DEH_MGR *hDehMgr, DBC_Require(pDehMgr); DBC_Require(pErrInfo); - DBG_Trace(DBG_LEVEL1, "Entering WMD_DEH_GetInfo: 0x%x\n", hDehMgr); - if (MEM_IsValidHandle(pDehMgr, SIGNATURE)) { /* Copy DEH error info structure to PROC error info * structure. */ @@ -326,8 +315,6 @@ DSP_STATUS WMD_DEH_GetInfo(struct DEH_MGR *hDehMgr, status = DSP_EHANDLE; } - DBG_Trace(DBG_LEVEL1, "Exiting WMD_DEH_GetInfo\n"); - return status; } -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 03/18] DSPBRIDGE: Remove entry point custom debug statements for pmgr 2010-02-16 8:42 ` [PATCH 02/18] DSPBRIDGE: Remove entry point custom debug statements for wmd Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 04/18] DSPBRIDGE: Remove entry point custom debug statements for wmd Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna Remove statements using GT_ENTER custom bridge level which is used to print entry and exit points from functions. Only COD, DBLL and DMM meaningful prints were left for reference when migrating to dev_dbg. This changes are split to touch pmgr folder only. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/pmgr/chnl.c | 20 ------ drivers/dsp/bridge/pmgr/cmm.c | 16 +---- drivers/dsp/bridge/pmgr/cod.c | 30 +--------- drivers/dsp/bridge/pmgr/dbll.c | 17 +----- drivers/dsp/bridge/pmgr/dev.c | 137 +++++---------------------------------- drivers/dsp/bridge/pmgr/dmm.c | 38 +----------- drivers/dsp/bridge/pmgr/io.c | 21 ------ drivers/dsp/bridge/pmgr/msg.c | 13 +---- drivers/dsp/bridge/pmgr/wcd.c | 122 +---------------------------------- 9 files changed, 28 insertions(+), 386 deletions(-) diff --git a/drivers/dsp/bridge/pmgr/chnl.c b/drivers/dsp/bridge/pmgr/chnl.c index e7c39b6..66464c7 100644 --- a/drivers/dsp/bridge/pmgr/chnl.c +++ b/drivers/dsp/bridge/pmgr/chnl.c @@ -71,11 +71,6 @@ DSP_STATUS CHNL_Create(OUT struct CHNL_MGR **phChnlMgr, DBC_Require(phChnlMgr != NULL); DBC_Require(pMgrAttrs != NULL); - GT_3trace(CHNL_DebugMask, GT_ENTER, - "Entered CHNL_Create: phChnlMgr: 0x%x\t" - "hDevObject: 0x%x\tpMgrAttrs:0x%x\n", - phChnlMgr, hDevObject, pMgrAttrs); - *phChnlMgr = NULL; /* Validate args: */ @@ -122,9 +117,6 @@ DSP_STATUS CHNL_Create(OUT struct CHNL_MGR **phChnlMgr, } } - GT_2trace(CHNL_DebugMask, GT_ENTER, - "Exiting CHNL_Create: pChnlMgr: 0x%x," - "status: 0x%x\n", pChnlMgr, status); DBC_Ensure(DSP_FAILED(status) || CHNL_IsValidMgr(pChnlMgr)); return status; @@ -143,8 +135,6 @@ DSP_STATUS CHNL_Destroy(struct CHNL_MGR *hChnlMgr) DBC_Require(cRefs > 0); - GT_1trace(CHNL_DebugMask, GT_ENTER, - "Entered CHNL_Destroy: hChnlMgr: 0x%x\n", hChnlMgr); if (CHNL_IsValidMgr(pChnlMgr)) { pIntfFxns = pChnlMgr->pIntfFxns; /* Let WMD channel module destroy the CHNL_MGR: */ @@ -155,9 +145,6 @@ DSP_STATUS CHNL_Destroy(struct CHNL_MGR *hChnlMgr) status = DSP_EHANDLE; } - GT_2trace(CHNL_DebugMask, GT_ENTER, - "Exiting CHNL_Destroy: pChnlMgr: 0x%x," - " status:0x%x\n", pChnlMgr, status); DBC_Ensure(DSP_FAILED(status) || !CHNL_IsValidMgr(pChnlMgr)); return status; @@ -174,9 +161,6 @@ void CHNL_Exit(void) cRefs--; - GT_1trace(CHNL_DebugMask, GT_5CLASS, - "Entered CHNL_Exit, ref count: 0x%x\n", cRefs); - DBC_Ensure(cRefs >= 0); } @@ -200,10 +184,6 @@ bool CHNL_Init(void) if (fRetval) cRefs++; - GT_1trace(CHNL_DebugMask, GT_5CLASS, - "Entered CHNL_Init, ref count: 0x%x\n", - cRefs); - DBC_Ensure((fRetval && (cRefs > 0)) || (!fRetval && (cRefs >= 0))); return fRetval; diff --git a/drivers/dsp/bridge/pmgr/cmm.c b/drivers/dsp/bridge/pmgr/cmm.c index 03d2e63..53855a9 100644 --- a/drivers/dsp/bridge/pmgr/cmm.c +++ b/drivers/dsp/bridge/pmgr/cmm.c @@ -261,9 +261,6 @@ DSP_STATUS CMM_Create(OUT struct CMM_OBJECT **phCmmMgr, DBC_Require(cRefs > 0); DBC_Require(phCmmMgr != NULL); - GT_3trace(CMM_debugMask, GT_ENTER, - "CMM_Create: phCmmMgr: 0x%x\thDevObject: " - "0x%x\tpMgrAttrs: 0x%x\n", phCmmMgr, hDevObject, pMgrAttrs); *phCmmMgr = NULL; /* create, zero, and tag a cmm mgr object */ MEM_AllocObject(pCmmObject, struct CMM_OBJECT, CMMSIGNATURE); @@ -394,9 +391,6 @@ void CMM_Exit(void) DBC_Require(cRefs > 0); cRefs--; - - GT_1trace(CMM_debugMask, GT_ENTER, - "exiting CMM_Exit,ref count:0x%x\n", cRefs); } /* @@ -414,7 +408,7 @@ DSP_STATUS CMM_FreeBuf(struct CMM_OBJECT *hCmmMgr, void *pBufPA, u32 ulSegId) DBC_Require(cRefs > 0); DBC_Require(pBufPA != NULL); - GT_1trace(CMM_debugMask, GT_ENTER, "CMM_FreeBuf pBufPA %x\n", pBufPA); + if (ulSegId == 0) { pAttrs = &CMM_DFLTALCTATTRS; ulSegId = pAttrs->ulSegId; @@ -554,9 +548,6 @@ bool CMM_Init(void) if (fRetval) cRefs++; - GT_1trace(CMM_debugMask, GT_ENTER, - "Entered CMM_Init,ref count:0x%x\n", cRefs); - DBC_Ensure((fRetval && (cRefs > 0)) || (!fRetval && (cRefs >= 0))); return fRetval; @@ -1012,10 +1003,7 @@ DSP_STATUS CMM_XlatorCreate(OUT struct CMM_XLATOROBJECT **phXlator, DBC_Require(cRefs > 0); DBC_Require(phXlator != NULL); DBC_Require(hCmmMgr != NULL); - GT_3trace(CMM_debugMask, GT_ENTER, - "CMM_XlatorCreate: phXlator: 0x%x\t" - "phCmmMgr: 0x%x\tpXlAttrs: 0x%x\n", phXlator, - hCmmMgr, pXlatorAttrs); + *phXlator = NULL; if (pXlatorAttrs == NULL) pXlatorAttrs = &CMM_DFLTXLATORATTRS; /* set defaults */ diff --git a/drivers/dsp/bridge/pmgr/cod.c b/drivers/dsp/bridge/pmgr/cod.c index 8a18ef9..6f659e5 100644 --- a/drivers/dsp/bridge/pmgr/cod.c +++ b/drivers/dsp/bridge/pmgr/cod.c @@ -232,10 +232,6 @@ DSP_STATUS COD_Create(OUT struct COD_MANAGER **phMgr, char *pstrDummyFile, DBC_Require(cRefs > 0); DBC_Require(phMgr != NULL); - GT_3trace(COD_debugMask, GT_ENTER, - "Entered COD_Create, Args: \t\nphMgr: " - "0x%x\t\npstrDummyFile: 0x%x\t\nattr: 0x%x\n", - phMgr, pstrDummyFile, attrs); /* assume failure */ *phMgr = NULL; @@ -288,8 +284,7 @@ DSP_STATUS COD_Create(OUT struct COD_MANAGER **phMgr, char *pstrDummyFile, /* return the new manager */ *phMgr = hMgrNew; - GT_1trace(COD_debugMask, GT_1CLASS, - "COD_Create: Success CodMgr: 0x%x\n", *phMgr); + return DSP_SOK; } @@ -303,7 +298,6 @@ void COD_Delete(struct COD_MANAGER *hMgr) DBC_Require(cRefs > 0); DBC_Require(IsValid(hMgr)); - GT_1trace(COD_debugMask, GT_ENTER, "COD_Delete:hMgr 0x%x\n", hMgr); if (hMgr->baseLib) { if (hMgr->fLoaded) hMgr->fxns.unloadFxn(hMgr->baseLib, &hMgr->attrs); @@ -330,9 +324,6 @@ void COD_Exit(void) cRefs--; - GT_1trace(COD_debugMask, GT_ENTER, - "Entered COD_Exit, ref count: 0x%x\n", cRefs); - DBC_Ensure(cRefs >= 0); } @@ -389,9 +380,6 @@ DSP_STATUS COD_GetEntry(struct COD_MANAGER *hManager, u32 *pulEntry) *pulEntry = hManager->ulEntry; - GT_1trace(COD_debugMask, GT_ENTER, "COD_GetEntry:ulEntr 0x%x\n", - *pulEntry); - return DSP_SOK; } @@ -433,10 +421,6 @@ DSP_STATUS COD_GetSection(struct COD_LIBRARYOBJ *lib, IN char *pstrSect, DBC_Require(puAddr != NULL); DBC_Require(puLen != NULL); - GT_4trace(COD_debugMask, GT_ENTER, - "Entered COD_GetSection Args \t\n lib: " - "0x%x\t\npstrsect: 0x%x\t\npuAddr: 0x%x\t\npuLen: 0x%x\n", - lib, pstrSect, puAddr, puLen); *puAddr = 0; *puLen = 0; if (lib != NULL) { @@ -521,9 +505,6 @@ bool COD_Init(void) if (fRetVal) cRefs++; - - GT_1trace(COD_debugMask, GT_1CLASS, - "Entered COD_Init, ref count: 0x%x\n", cRefs); DBC_Ensure((fRetVal && cRefs > 0) || (!fRetVal && cRefs >= 0)); return fRetVal; } @@ -558,11 +539,6 @@ DSP_STATUS COD_LoadBase(struct COD_MANAGER *hMgr, u32 nArgc, char *aArgs[], DBC_Require(pfnWrite != NULL); DBC_Require(hMgr->baseLib != NULL); - GT_6trace(COD_debugMask, GT_ENTER, - "Entered COD_LoadBase, hMgr: 0x%x\n \t" - "nArgc: 0x%x\n\taArgs: 0x%x\n\tpfnWrite: 0x%x\n\tpArb:" - " 0x%x\n \tenvp: 0x%x\n", hMgr, nArgc, aArgs, pfnWrite, - pArb, envp); /* * Make sure every argv[] stated in argc has a value, or change argc to * reflect true number in NULL terminated argv array. @@ -711,10 +687,6 @@ DSP_STATUS COD_ReadSection(struct COD_LIBRARYOBJ *lib, IN char *pstrSect, DBC_Require(pstrSect != NULL); DBC_Require(pstrContent != NULL); - GT_4trace(COD_debugMask, GT_ENTER, "Entered COD_ReadSection Args: 0x%x," - " 0x%x, 0x%x, 0x%x\n", lib, pstrSect, pstrContent, - cContentSize); - if (lib != NULL) { status = lib->hCodMgr->fxns.readSectFxn(lib->dbllLib, pstrSect, pstrContent, diff --git a/drivers/dsp/bridge/pmgr/dbll.c b/drivers/dsp/bridge/pmgr/dbll.c index af71212..22e08bd 100644 --- a/drivers/dsp/bridge/pmgr/dbll.c +++ b/drivers/dsp/bridge/pmgr/dbll.c @@ -220,7 +220,6 @@ void DBLL_close(struct DBLL_LibraryObj *zlLib) DBC_Require(MEM_IsValidHandle(zlLib, DBLL_LIBSIGNATURE)); DBC_Require(zlLib->openRef > 0); zlTarget = zlLib->pTarget; - GT_1trace(DBLL_debugMask, GT_ENTER, "DBLL_close: lib: 0x%x\n", zlLib); zlLib->openRef--; if (zlLib->openRef == 0) { /* Remove library from list */ @@ -259,9 +258,6 @@ DSP_STATUS DBLL_create(struct DBLL_TarObj **pTarget, struct DBLL_Attrs *pAttrs) DBC_Require(pAttrs != NULL); DBC_Require(pTarget != NULL); - GT_2trace(DBLL_debugMask, GT_ENTER, - "DBLL_create: pTarget: 0x%x pAttrs: " - "0x%x\n", pTarget, pAttrs); /* Allocate DBL target object */ MEM_AllocObject(pzlTarget, struct DBLL_TarObj, DBLL_TARGSIGNATURE); if (pTarget != NULL) { @@ -294,9 +290,6 @@ void DBLL_delete(struct DBLL_TarObj *target) DBC_Require(cRefs > 0); DBC_Require(MEM_IsValidHandle(zlTarget, DBLL_TARGSIGNATURE)); - GT_1trace(DBLL_debugMask, GT_ENTER, "DBLL_delete: target: 0x%x\n", - target); - if (zlTarget != NULL) MEM_FreeObject(zlTarget); @@ -312,9 +305,6 @@ void DBLL_exit(void) cRefs--; - GT_1trace(DBLL_debugMask, GT_5CLASS, "DBLL_exit() ref count: 0x%x\n", - cRefs); - if (cRefs == 0) { GH_exit(); #if GT_TRACE @@ -476,9 +466,6 @@ bool DBLL_init(void) cRefs++; - GT_1trace(DBLL_debugMask, GT_5CLASS, "DBLL_init(), ref count: 0x%x\n", - cRefs); - return true; } @@ -848,9 +835,7 @@ void DBLL_setAttrs(struct DBLL_TarObj *target, struct DBLL_Attrs *pAttrs) DBC_Require(cRefs > 0); DBC_Require(MEM_IsValidHandle(zlTarget, DBLL_TARGSIGNATURE)); DBC_Require(pAttrs != NULL); - GT_2trace(DBLL_debugMask, GT_ENTER, - "DBLL_setAttrs: target: 0x%x pAttrs: " - "0x%x\n", target, pAttrs); + if ((pAttrs != NULL) && (zlTarget != NULL)) zlTarget->attrs = *pAttrs; diff --git a/drivers/dsp/bridge/pmgr/dev.c b/drivers/dsp/bridge/pmgr/dev.c index d86bc9c..5719519 100644 --- a/drivers/dsp/bridge/pmgr/dev.c +++ b/drivers/dsp/bridge/pmgr/dev.c @@ -115,11 +115,6 @@ u32 DEV_BrdWriteFxn(void *pArb, u32 ulDspAddr, void *pHostBuf, DBC_Require(cRefs > 0); DBC_Require(pHostBuf != NULL); /* Required of BrdWrite(). */ - GT_5trace(debugMask, GT_ENTER, - "Entered DEV_BrdWriteFxn, pArb: 0x%x\n\t\t" - "ulDspAddr: 0x%x\n\t\tpHostBuf: 0x%x\n \t\tulNumBytes: 0x%x\n" - "\t\tnMemSpace: 0x%x\n", pArb, ulDspAddr, pHostBuf, - ulNumBytes, nMemSpace); if (IsValidHandle(pDevObject)) { /* Require of BrdWrite() */ DBC_Assert(pDevObject->hWmdContext != NULL); @@ -133,8 +128,6 @@ u32 DEV_BrdWriteFxn(void *pArb, u32 ulDspAddr, void *pHostBuf, ulWritten = ulNumBytes; } - GT_1trace(debugMask, GT_ENTER, "Exit DEV_BrdWriteFxn ulWritten: 0x%x\n", - ulWritten); return ulWritten; } @@ -164,11 +157,6 @@ DSP_STATUS DEV_CreateDevice(OUT struct DEV_OBJECT **phDevObject, DBC_Require(pHostConfig != NULL); DBC_Require(pDspConfig != NULL); - GT_5trace(debugMask, GT_ENTER, - "Entered DEV_CreateDevice, phDevObject: 0x%x\n" - "\t\tpstrWMDFileName: 0x%x\n\t\tpHostConfig:0x%x\n\t\t" - "pDspConfig: 0x%x\n\t\tnhDevNode: 0x%x\n", phDevObject, - pstrWMDFileName, pHostConfig, pDspConfig, hDevNode); /* Get the WMD interface functions*/ WMD_DRV_Entry(&pDrvFxns, pstrWMDFileName); if (DSP_FAILED(CFG_GetObject((u32 *) &hDrvObject, REG_DRV_OBJECT))) { @@ -309,8 +297,7 @@ DSP_STATUS DEV_CreateDevice(OUT struct DEV_OBJECT **phDevObject, *phDevObject = NULL; GT_0trace(debugMask, GT_7CLASS, "DEV_CreateDevice Failed\n"); } - GT_1trace(debugMask, GT_1CLASS, "Exiting DEV_Create: DevObject 0x%x\n", - *phDevObject); + DBC_Ensure((DSP_SUCCEEDED(status) && IsValidHandle(*phDevObject)) || (DSP_FAILED(status) && !*phDevObject)); return status; @@ -331,8 +318,6 @@ DSP_STATUS DEV_Create2(struct DEV_OBJECT *hDevObject) DBC_Require(cRefs > 0); DBC_Require(IsValidHandle(hDevObject)); - GT_1trace(debugMask, GT_ENTER, - "Entered DEV_Create2, hDevObject: 0x%x\n", hDevObject); /* There can be only one Node Manager per DEV object */ DBC_Assert(!pDevObject->hNodeMgr); status = NODE_CreateMgr(&pDevObject->hNodeMgr, hDevObject); @@ -345,9 +330,6 @@ DSP_STATUS DEV_Create2(struct DEV_OBJECT *hDevObject) } DBC_Ensure((DSP_SUCCEEDED(status) && pDevObject->hNodeMgr != NULL) || (DSP_FAILED(status) && pDevObject->hNodeMgr == NULL)); - GT_2trace(debugMask, GT_ENTER, - "Exiting DEV_Create2, hNodeMgr: 0x%x, status:" - " 0x%x\n", pDevObject->hNodeMgr, status); return status; } @@ -364,9 +346,6 @@ DSP_STATUS DEV_Destroy2(struct DEV_OBJECT *hDevObject) DBC_Require(cRefs > 0); DBC_Require(IsValidHandle(hDevObject)); - GT_1trace(debugMask, GT_ENTER, - "Entered DEV_Destroy2, hDevObject: 0x%x\n", - hDevObject); if (pDevObject->hNodeMgr) { if (DSP_FAILED(NODE_DeleteMgr(pDevObject->hNodeMgr))) status = DSP_EFAIL; @@ -379,9 +358,6 @@ DSP_STATUS DEV_Destroy2(struct DEV_OBJECT *hDevObject) DBC_Ensure((DSP_SUCCEEDED(status) && pDevObject->hNodeMgr == NULL) || DSP_FAILED(status)); - GT_2trace(debugMask, GT_ENTER, - "Exiting DEV_Destroy2, hNodeMgr: 0x%x, status" - " = 0x%x\n", pDevObject->hNodeMgr, status); return status; } @@ -398,8 +374,6 @@ DSP_STATUS DEV_DestroyDevice(struct DEV_OBJECT *hDevObject) DBC_Require(cRefs > 0); - GT_1trace(debugMask, GT_ENTER, "Entered DEV_DestroyDevice, hDevObject: " - "0x%x\n", hDevObject); if (IsValidHandle(hDevObject)) { if (pDevObject->hCodMgr) { COD_Delete(pDevObject->hCodMgr); @@ -465,8 +439,7 @@ DSP_STATUS DEV_DestroyDevice(struct DEV_OBJECT *hDevObject) GT_0trace(debugMask, GT_7CLASS, "DEV_Destroy: Invlaid handle"); status = DSP_EHANDLE; } - GT_1trace(debugMask, GT_ENTER, "Exit DEV_destroy: status 0x%x\n", - status); + return status; } @@ -485,9 +458,6 @@ DSP_STATUS DEV_GetChnlMgr(struct DEV_OBJECT *hDevObject, DBC_Require(cRefs > 0); DBC_Require(phMgr != NULL); - GT_2trace(debugMask, GT_ENTER, - "Entered DEV_GetChnlMgr, hDevObject: 0x%x\n\t" - "\tphMgr: 0x%x\n", hDevObject, phMgr); if (IsValidHandle(hDevObject)) { *phMgr = pDevObject->hChnlMgr; } else { @@ -496,9 +466,7 @@ DSP_STATUS DEV_GetChnlMgr(struct DEV_OBJECT *hDevObject, GT_0trace(debugMask, GT_7CLASS, "DEV_GetChnlMgr: Invalid handle"); } - GT_2trace(debugMask, GT_ENTER, - "Exit DEV_GetChnlMgr: status 0x%x\t\n hMgr: " - "0x%x\n", status, *phMgr); + DBC_Ensure(DSP_SUCCEEDED(status) || ((phMgr != NULL) && (*phMgr == NULL))); return status; @@ -518,9 +486,7 @@ DSP_STATUS DEV_GetCmmMgr(struct DEV_OBJECT *hDevObject, DBC_Require(cRefs > 0); DBC_Require(phMgr != NULL); - GT_2trace(debugMask, GT_ENTER, - "Entered DEV_GetCmmMgr, hDevObject: 0x%x\n\t" - "\tphMgr: 0x%x\n", hDevObject, phMgr); + if (IsValidHandle(hDevObject)) { *phMgr = pDevObject->hCmmMgr; } else { @@ -529,9 +495,7 @@ DSP_STATUS DEV_GetCmmMgr(struct DEV_OBJECT *hDevObject, GT_0trace(debugMask, GT_7CLASS, "DEV_GetCmmMgr: Invalid handle"); } - GT_2trace(debugMask, GT_ENTER, - "Exit DEV_GetCmmMgr: status 0x%x\t\nhMgr: " - "0x%x\n", status, *phMgr); + DBC_Ensure(DSP_SUCCEEDED(status) || ((phMgr != NULL) && (*phMgr == NULL))); return status; @@ -552,8 +516,6 @@ DSP_STATUS DEV_GetDmmMgr(struct DEV_OBJECT *hDevObject, DBC_Require(cRefs > 0); DBC_Require(phMgr != NULL); - GT_2trace(debugMask, GT_ENTER, "Entered DEV_GetDmmMgr, hDevObject: " - "0x%x\n\t\tphMgr: 0x%x\n", hDevObject, phMgr); if (IsValidHandle(hDevObject)) { *phMgr = pDevObject->hDmmMgr; } else { @@ -562,9 +524,7 @@ DSP_STATUS DEV_GetDmmMgr(struct DEV_OBJECT *hDevObject, GT_0trace(debugMask, GT_7CLASS, "DEV_GetDmmMgr: Invalid handle"); } - GT_2trace(debugMask, GT_ENTER, - "Exit DEV_GetDmmMgr: status 0x%x\t\n hMgr: " - "0x%x\n", status, *phMgr); + DBC_Ensure(DSP_SUCCEEDED(status) || ((phMgr != NULL) && (*phMgr == NULL))); return status; @@ -584,9 +544,6 @@ DSP_STATUS DEV_GetCodMgr(struct DEV_OBJECT *hDevObject, DBC_Require(cRefs > 0); DBC_Require(phCodMgr != NULL); - GT_2trace(debugMask, GT_ENTER, - "Entered DEV_GetCodMgr, hDevObject: 0x%x\n\t\t" - "phCodMgr: 0x%x\n", hDevObject, phCodMgr); if (IsValidHandle(hDevObject)) { *phCodMgr = pDevObject->hCodMgr; } else { @@ -596,9 +553,7 @@ DSP_STATUS DEV_GetCodMgr(struct DEV_OBJECT *hDevObject, "DEV_GetCodMgr, invalid handle: 0x%x\n", hDevObject); } - GT_2trace(debugMask, GT_ENTER, - "Exit DEV_GetCodMgr: status 0x%x\t\n hCodMgr:" - " 0x%x\n", status, *phCodMgr); + DBC_Ensure(DSP_SUCCEEDED(status) || ((phCodMgr != NULL) && (*phCodMgr == NULL))); return status; @@ -640,9 +595,6 @@ DSP_STATUS DEV_GetDevNode(struct DEV_OBJECT *hDevObject, DBC_Require(cRefs > 0); DBC_Require(phDevNode != NULL); - GT_2trace(debugMask, GT_ENTER, - "Entered DEV_GetDevNode, hDevObject: 0x%x\n\t" - "\tphDevNode: 0x%x\n", hDevObject, phDevNode); if (IsValidHandle(hDevObject)) { *phDevNode = pDevObject->hDevNode; } else { @@ -651,9 +603,7 @@ DSP_STATUS DEV_GetDevNode(struct DEV_OBJECT *hDevObject, GT_0trace(debugMask, GT_7CLASS, "DEV_GetDevNode: Invalid handle"); } - GT_2trace(debugMask, GT_ENTER, - "Exit DEV_GetDevNode: status 0x%x\t\nhDevNode:" - "0x%x\n", status, *phDevNode); + DBC_Ensure(DSP_SUCCEEDED(status) || ((phDevNode != NULL) && (*phDevNode == NULL))); return status; @@ -691,9 +641,6 @@ DSP_STATUS DEV_GetIntfFxns(struct DEV_OBJECT *hDevObject, DBC_Require(cRefs > 0); DBC_Require(ppIntfFxns != NULL); - GT_2trace(debugMask, GT_ENTER, - "Entered DEV_GetIntfFxns, hDevObject: 0x%x\n\t" - "\tppIntfFxns: 0x%x\n", hDevObject, ppIntfFxns); if (IsValidHandle(hDevObject)) { *ppIntfFxns = &pDevObject->intfFxns; } else { @@ -702,8 +649,7 @@ DSP_STATUS DEV_GetIntfFxns(struct DEV_OBJECT *hDevObject, GT_0trace(debugMask, GT_7CLASS, "DEV_GetIntDxns: Invalid handle"); } - GT_2trace(debugMask, GT_ENTER, "Exit DEV_GetIntFxns: status 0x%x\t\n" - "ppIntFxns: 0x%x\n", status, *ppIntfFxns); + DBC_Ensure(DSP_SUCCEEDED(status) || ((ppIntfFxns != NULL) && (*ppIntfFxns == NULL))); return status; @@ -778,9 +724,6 @@ DSP_STATUS DEV_GetNodeManager(struct DEV_OBJECT *hDevObject, DBC_Require(cRefs > 0); DBC_Require(phNodeMgr != NULL); - GT_2trace(debugMask, GT_ENTER, - "Entered DEV_GetNodeManager, hDevObject: 0x%x" - "\n\t\tphNodeMgr: 0x%x\n", hDevObject, phNodeMgr); if (IsValidHandle(hDevObject)) { *phNodeMgr = pDevObject->hNodeMgr; } else { @@ -790,9 +733,7 @@ DSP_STATUS DEV_GetNodeManager(struct DEV_OBJECT *hDevObject, "DEV_GetNodeManager, invalid handle: 0x" "%x\n", hDevObject); } - GT_2trace(debugMask, GT_ENTER, - "Exit DEV_GetNodeManager: status 0x%x\t\nhMgr:" - " 0x%x\n", status, *phNodeMgr); + DBC_Ensure(DSP_SUCCEEDED(status) || ((phNodeMgr != NULL) && (*phNodeMgr == NULL))); return status; @@ -810,10 +751,6 @@ DSP_STATUS DEV_GetSymbol(struct DEV_OBJECT *hDevObject, DBC_Require(cRefs > 0); DBC_Require(pstrSym != NULL && pulValue != NULL); - GT_3trace(debugMask, GT_ENTER, - "Entered DEV_GetSymbol, hDevObject: 0x%x\n\t\t" - "pstrSym: 0x%x\n\t\tpulValue: 0x%x\n", hDevObject, pstrSym, - pulValue); if (IsValidHandle(hDevObject)) { status = DEV_GetCodMgr(hDevObject, &hCodMgr); if (DSP_SUCCEEDED(status)) { @@ -826,8 +763,7 @@ DSP_STATUS DEV_GetSymbol(struct DEV_OBJECT *hDevObject, GT_0trace(debugMask, GT_7CLASS, "DEV_GetSymbol: Invalid handle"); } - GT_2trace(debugMask, GT_ENTER, "Exit DEV_GetSymbol: status 0x%x\t\n" - "hWmdContext: 0x%x\n", status, *pulValue); + return status; } @@ -844,9 +780,7 @@ DSP_STATUS DEV_GetWMDContext(struct DEV_OBJECT *hDevObject, DBC_Require(cRefs > 0); DBC_Require(phWmdContext != NULL); - GT_2trace(debugMask, GT_ENTER, - "Entered DEV_GetWMDContext, hDevObject: 0x%x\n" - "\t\tphWmdContext: 0x%x\n", hDevObject, phWmdContext); + if (IsValidHandle(hDevObject)) { *phWmdContext = pDevObject->hWmdContext; } else { @@ -856,9 +790,6 @@ DSP_STATUS DEV_GetWMDContext(struct DEV_OBJECT *hDevObject, "DEV_GetWMDContext: Invalid handle"); } - GT_2trace(debugMask, GT_ENTER, - "Exit DEV_GetWMDContext: status 0x%x\t\n" - "hWmdContext: 0x%x\n", status, *phWmdContext); DBC_Ensure(DSP_SUCCEEDED(status) || ((phWmdContext != NULL) && (*phWmdContext == NULL))); return status; @@ -881,9 +812,6 @@ void DEV_Exit(void) DMM_Exit(); } - GT_1trace(debugMask, GT_5CLASS, "Entered DEV_Exit, ref count: 0x%x\n", - cRefs); - DBC_Ensure(cRefs >= 0); } @@ -921,10 +849,6 @@ bool DEV_Init(void) if (fRetval) cRefs++; - - GT_1trace(debugMask, GT_5CLASS, "Entered DEV_Init, ref count: 0x%x\n", - cRefs); - DBC_Ensure((fRetval && (cRefs > 0)) || (!fRetval && (cRefs >= 0))); return fRetval; @@ -942,9 +866,6 @@ DSP_STATUS DEV_NotifyClients(struct DEV_OBJECT *hDevObject, u32 ulStatus) struct DEV_OBJECT *pDevObject = hDevObject; DSP_HPROCESSOR hProcObject; - GT_2trace(debugMask, GT_ENTER, - "Entered DEV_NotifyClients, hDevObject: 0x%x\n" - "\t\tulStatus: 0x%x\n", hDevObject, ulStatus); for (hProcObject = (DSP_HPROCESSOR)LST_First(pDevObject->procList); hProcObject != NULL; hProcObject = (DSP_HPROCESSOR)LST_Next(pDevObject->procList, @@ -963,8 +884,6 @@ DSP_STATUS DEV_RemoveDevice(struct CFG_DEVNODE *hDevNode) DSP_STATUS status = DSP_SOK; struct DEV_OBJECT *pDevObject; - GT_1trace(debugMask, GT_ENTER, - "Entered DEV_RemoveDevice, hDevNode: 0x%x\n", hDevNode); /* Retrieve the device object handle originaly stored with * the DevNode: */ status = CFG_GetDevObject(hDevNode, (u32 *)&hDevObject); @@ -979,8 +898,7 @@ DSP_STATUS DEV_RemoveDevice(struct CFG_DEVNODE *hDevNode) "DEV_RemoveDevice, success"); } } - GT_1trace(debugMask, GT_ENTER, "Exit DEV_RemoveDevice, status: 0x%x\n", - status); + return status; } @@ -996,9 +914,6 @@ DSP_STATUS DEV_SetChnlMgr(struct DEV_OBJECT *hDevObject, struct CHNL_MGR *hMgr) DBC_Require(cRefs > 0); - GT_2trace(debugMask, GT_ENTER, - "Entered DEV_SetChnlMgr, hDevObject: 0x%x\n\t" - "\thMgr:0x%x\n", hDevObject, hMgr); if (IsValidHandle(hDevObject)) { pDevObject->hChnlMgr = hMgr; } else { @@ -1019,9 +934,7 @@ void DEV_SetMsgMgr(struct DEV_OBJECT *hDevObject, struct MSG_MGR *hMgr) { DBC_Require(cRefs > 0); DBC_Require(IsValidHandle(hDevObject)); - GT_2trace(debugMask, GT_ENTER, - "Entered DEV_SetMsgMgr, hDevObject: 0x%x\n\t\t" - "hMgr: 0x%x\n", hDevObject, hMgr); + hDevObject->hMsgMgr = hMgr; } @@ -1041,8 +954,6 @@ DSP_STATUS DEV_StartDevice(struct CFG_DEVNODE *hDevNode) DBC_Require(cRefs > 0); - GT_1trace(debugMask, GT_ENTER, - "Entered DEV_StartDevice, hDevObject: 0x%x\n", hDevNode); status = CFG_GetHostResources(hDevNode, &hostRes); if (DSP_SUCCEEDED(status)) { /* Get DSP resources of device from Registry: */ @@ -1094,8 +1005,7 @@ DSP_STATUS DEV_StartDevice(struct CFG_DEVNODE *hDevNode) /* Ensure the device extension is NULL */ CFG_SetDevObject(hDevNode, 0L); } - GT_1trace(debugMask, GT_ENTER, "Exiting DEV_StartDevice status 0x%x\n", - status); + return status; } @@ -1159,11 +1069,9 @@ static DSP_STATUS InitCodMgr(struct DEV_OBJECT *pDevObject) DBC_Require(cRefs > 0); DBC_Require(!IsValidHandle(pDevObject) || (pDevObject->hCodMgr == NULL)); - GT_1trace(debugMask, GT_ENTER, "Entering InitCodMgr pDevObject: 0x%x", - pDevObject); + status = COD_Create(&pDevObject->hCodMgr, szDummyFile, NULL); - GT_1trace(debugMask, GT_ENTER, "Exiting InitCodMgr status 0x%x\n ", - status); + return status; } @@ -1193,9 +1101,6 @@ DSP_STATUS DEV_InsertProcObject(struct DEV_OBJECT *hDevObject, DSP_STATUS status = DSP_SOK; struct DEV_OBJECT *pDevObject = (struct DEV_OBJECT *)hDevObject; - GT_2trace(debugMask, GT_ENTER, - "Entering DEV_InsetProcObject pProcObject 0x%x" - "pDevObject 0x%x\n", hProcObject, hDevObject); DBC_Require(cRefs > 0); DBC_Require(IsValidHandle(pDevObject)); DBC_Require(hProcObject != 0); @@ -1207,8 +1112,6 @@ DSP_STATUS DEV_InsertProcObject(struct DEV_OBJECT *hDevObject, /* Add DevObject to tail. */ LST_PutTail(pDevObject->procList, (struct list_head *)hProcObject); - GT_1trace(debugMask, GT_ENTER, - "Exiting DEV_InsetProcObject status 0x%x\n", status); DBC_Ensure(DSP_SUCCEEDED(status) && !LST_IsEmpty(pDevObject->procList)); return status; @@ -1244,9 +1147,6 @@ DSP_STATUS DEV_RemoveProcObject(struct DEV_OBJECT *hDevObject, DBC_Require(pDevObject->procList != NULL); DBC_Require(!LST_IsEmpty(pDevObject->procList)); - GT_1trace(debugMask, GT_ENTER, - "Entering DEV_RemoveProcObject hDevObject " - "0x%x\n", hDevObject); /* Search list for pDevObject: */ for (pCurElem = LST_First(pDevObject->procList); pCurElem != NULL; pCurElem = LST_Next(pDevObject->procList, pCurElem)) { @@ -1257,8 +1157,7 @@ DSP_STATUS DEV_RemoveProcObject(struct DEV_OBJECT *hDevObject, break; } } - GT_1trace(debugMask, GT_ENTER, "DEV_RemoveProcObject returning 0x%x\n", - status); + return status; } diff --git a/drivers/dsp/bridge/pmgr/dmm.c b/drivers/dsp/bridge/pmgr/dmm.c index 2425f0f..8dbcb77 100644 --- a/drivers/dsp/bridge/pmgr/dmm.c +++ b/drivers/dsp/bridge/pmgr/dmm.c @@ -102,9 +102,6 @@ DSP_STATUS DMM_CreateTables(struct DMM_OBJECT *hDmmMgr, u32 addr, u32 size) struct DMM_OBJECT *pDmmObj = (struct DMM_OBJECT *)hDmmMgr; DSP_STATUS status = DSP_SOK; - GT_3trace(DMM_debugMask, GT_ENTER, - "Entered DMM_CreateTables () hDmmMgr %x, addr" - " %x, size %x\n", hDmmMgr, addr, size); status = DMM_DeleteTables(pDmmObj); if (DSP_SUCCEEDED(status)) { SYNC_EnterCS(pDmmObj->hDmmLock); @@ -128,8 +125,6 @@ DSP_STATUS DMM_CreateTables(struct DMM_OBJECT *hDmmMgr, u32 addr, u32 size) "DMM_CreateTables: DMM_DeleteTables" "Failure\n"); - GT_1trace(DMM_debugMask, GT_4CLASS, "Leaving DMM_CreateTables status" - "0x%x\n", status); return status; } @@ -147,9 +142,6 @@ DSP_STATUS DMM_Create(OUT struct DMM_OBJECT **phDmmMgr, DBC_Require(cRefs > 0); DBC_Require(phDmmMgr != NULL); - GT_3trace(DMM_debugMask, GT_ENTER, - "DMM_Create: phDmmMgr: 0x%x hDevObject: " - "0x%x pMgrAttrs: 0x%x\n", phDmmMgr, hDevObject, pMgrAttrs); *phDmmMgr = NULL; /* create, zero, and tag a cmm mgr object */ MEM_AllocObject(pDmmObject, struct DMM_OBJECT, DMMSIGNATURE); @@ -165,9 +157,6 @@ DSP_STATUS DMM_Create(OUT struct DMM_OBJECT **phDmmMgr, "Failure(DMM Object)\n"); status = DSP_EMEMORY; } - GT_2trace(DMM_debugMask, GT_4CLASS, - "Leaving DMM_Create status %x pDmmObject %x\n", - status, pDmmObject); return status; } @@ -182,8 +171,6 @@ DSP_STATUS DMM_Destroy(struct DMM_OBJECT *hDmmMgr) struct DMM_OBJECT *pDmmObj = (struct DMM_OBJECT *)hDmmMgr; DSP_STATUS status = DSP_SOK; - GT_1trace(DMM_debugMask, GT_ENTER, - "Entered DMM_Destroy () hDmmMgr %x\n", hDmmMgr); DBC_Require(cRefs > 0); if (MEM_IsValidHandle(hDmmMgr, DMMSIGNATURE)) { status = DMM_DeleteTables(pDmmObj); @@ -197,8 +184,7 @@ DSP_STATUS DMM_Destroy(struct DMM_OBJECT *hDmmMgr) "Failure\n"); } else status = DSP_EHANDLE; - GT_1trace(DMM_debugMask, GT_4CLASS, "Leaving DMM_Destroy status %x\n", - status); + return status; } @@ -213,8 +199,6 @@ DSP_STATUS DMM_DeleteTables(struct DMM_OBJECT *hDmmMgr) struct DMM_OBJECT *pDmmObj = (struct DMM_OBJECT *)hDmmMgr; DSP_STATUS status = DSP_SOK; - GT_1trace(DMM_debugMask, GT_ENTER, - "Entered DMM_DeleteTables () hDmmMgr %x\n", hDmmMgr); DBC_Require(cRefs > 0); if (MEM_IsValidHandle(hDmmMgr, DMMSIGNATURE)) { /* Delete all DMM tables */ @@ -225,8 +209,6 @@ DSP_STATUS DMM_DeleteTables(struct DMM_OBJECT *hDmmMgr) SYNC_LeaveCS(pDmmObj->hDmmLock); } else status = DSP_EHANDLE; - GT_1trace(DMM_debugMask, GT_4CLASS, - "Leaving DMM_DeleteTables status %x\n", status); return status; } @@ -244,9 +226,6 @@ void DMM_Exit(void) DBC_Require(cRefs > 0); cRefs--; - - GT_1trace(DMM_debugMask, GT_ENTER, - "exiting DMM_Exit, ref count:0x%x\n", cRefs); } /* @@ -261,9 +240,6 @@ DSP_STATUS DMM_GetHandle(DSP_HPROCESSOR hProcessor, DSP_STATUS status = DSP_SOK; struct DEV_OBJECT *hDevObject; - GT_2trace(DMM_debugMask, GT_ENTER, - "DMM_GetHandle: hProcessor %x, phDmmMgr" - "%x\n", hProcessor, phDmmMgr); DBC_Require(cRefs > 0); DBC_Require(phDmmMgr != NULL); if (hProcessor != NULL) @@ -274,8 +250,6 @@ DSP_STATUS DMM_GetHandle(DSP_HPROCESSOR hProcessor, if (DSP_SUCCEEDED(status)) status = DEV_GetDmmMgr(hDevObject, phDmmMgr); - GT_2trace(DMM_debugMask, GT_4CLASS, "Leaving DMM_GetHandle status %x, " - "*phDmmMgr %x\n", status, phDmmMgr ? *phDmmMgr : NULL); return status; } @@ -299,9 +273,6 @@ bool DMM_Init(void) if (fRetval) cRefs++; - GT_1trace(DMM_debugMask, GT_ENTER, - "Entered DMM_Init, ref count:0x%x\n", cRefs); - DBC_Ensure((fRetval && (cRefs > 0)) || (!fRetval && (cRefs >= 0))); pVirtualMappingTable = NULL ; @@ -493,9 +464,6 @@ static struct MapPage *GetRegion(u32 aAddr) struct MapPage *currRegion = NULL; u32 i = 0; - GT_1trace(DMM_debugMask, GT_ENTER, "Entered GetRegion () " - " aAddr %x\n", aAddr); - if (pVirtualMappingTable != NULL) { /* find page mapped by this address */ i = DMM_ADDR_TO_INDEX(aAddr); @@ -519,8 +487,6 @@ static struct MapPage *GetFreeRegion(u32 aSize) u32 i = 0; u32 RegionSize = 0; u32 nextI = 0; - GT_1trace(DMM_debugMask, GT_ENTER, "Entered GetFreeRegion () " - "aSize 0x%x\n", aSize); if (pVirtualMappingTable == NULL) return currRegion; @@ -565,8 +531,6 @@ static struct MapPage *GetMappedRegion(u32 aAddr) { u32 i = 0; struct MapPage *currRegion = NULL; - GT_1trace(DMM_debugMask, GT_ENTER, "Entered GetMappedRegion () " - "aAddr 0x%x\n", aAddr); if (pVirtualMappingTable == NULL) return currRegion; diff --git a/drivers/dsp/bridge/pmgr/io.c b/drivers/dsp/bridge/pmgr/io.c index 5dbb784..3b1156a 100644 --- a/drivers/dsp/bridge/pmgr/io.c +++ b/drivers/dsp/bridge/pmgr/io.c @@ -65,10 +65,6 @@ DSP_STATUS IO_Create(OUT struct IO_MGR **phIOMgr, struct DEV_OBJECT *hDevObject, DBC_Require(phIOMgr != NULL); DBC_Require(pMgrAttrs != NULL); - GT_3trace(IO_DebugMask, GT_ENTER, "Entered IO_Create: phIOMgr: 0x%x\t " - "hDevObject: 0x%x\tpMgrAttrs: 0x%x\n", - phIOMgr, hDevObject, pMgrAttrs); - *phIOMgr = NULL; /* A memory base of 0 implies no memory base: */ @@ -104,10 +100,6 @@ DSP_STATUS IO_Create(OUT struct IO_MGR **phIOMgr, struct DEV_OBJECT *hDevObject, } } - GT_2trace(IO_DebugMask, GT_ENTER, - "Exiting IO_Create: hIOMgr: 0x%x, status:" - " 0x%x\n", hIOMgr, status); - return status; } @@ -124,17 +116,11 @@ DSP_STATUS IO_Destroy(struct IO_MGR *hIOMgr) DBC_Require(cRefs > 0); - GT_1trace(IO_DebugMask, GT_ENTER, "Entered IO_Destroy: hIOMgr: 0x%x\n", - hIOMgr); - pIntfFxns = pIOMgr->pIntfFxns; /* Let WMD channel module destroy the IO_MGR: */ status = (*pIntfFxns->pfnIODestroy) (hIOMgr); - GT_2trace(IO_DebugMask, GT_ENTER, - "Exiting IO_Destroy: pIOMgr: 0x%x, status:" - " 0x%x\n", pIOMgr, status); return status; } @@ -149,9 +135,6 @@ void IO_Exit(void) cRefs--; - GT_1trace(IO_DebugMask, GT_5CLASS, - "Entered IO_Exit, ref count: 0x%x\n", cRefs); - DBC_Ensure(cRefs >= 0); } @@ -174,10 +157,6 @@ bool IO_Init(void) if (fRetval) cRefs++; - - GT_1trace(IO_DebugMask, GT_5CLASS, - "Entered IO_Init, ref count: 0x%x\n", cRefs); - DBC_Ensure((fRetval && (cRefs > 0)) || (!fRetval && (cRefs >= 0))); return fRetval; diff --git a/drivers/dsp/bridge/pmgr/msg.c b/drivers/dsp/bridge/pmgr/msg.c index 5cfeb5b..1ba1c88 100644 --- a/drivers/dsp/bridge/pmgr/msg.c +++ b/drivers/dsp/bridge/pmgr/msg.c @@ -66,10 +66,6 @@ DSP_STATUS MSG_Create(OUT struct MSG_MGR **phMsgMgr, DBC_Require(msgCallback != NULL); DBC_Require(hDevObject != NULL); - GT_3trace(MSG_debugMask, GT_ENTER, "MSG_Create: phMsgMgr: 0x%x\t" - "hDevObject: 0x%x\tmsgCallback: 0x%x\n", - phMsgMgr, hDevObject, msgCallback); - *phMsgMgr = NULL; DEV_GetIntfFxns(hDevObject, &pIntfFxns); @@ -106,9 +102,6 @@ void MSG_Delete(struct MSG_MGR *hMsgMgr) DBC_Require(cRefs > 0); DBC_Require(MEM_IsValidHandle(pMsgMgr, MSGMGR_SIGNATURE)); - GT_1trace(MSG_debugMask, GT_ENTER, "MSG_Delete: hMsgMgr: 0x%x\n", - hMsgMgr); - pIntfFxns = pMsgMgr->pIntfFxns; /* Let WMD message module destroy the MSG_MGR: */ @@ -126,8 +119,7 @@ void MSG_Exit(void) { DBC_Require(cRefs > 0); cRefs--; - GT_1trace(MSG_debugMask, GT_5CLASS, - "Entered MSG_Exit, ref count: 0x%x\n", cRefs); + DBC_Ensure(cRefs >= 0); } @@ -145,9 +137,6 @@ bool MSG_Init(void) cRefs++; - GT_1trace(MSG_debugMask, GT_5CLASS, "MSG_Init(), ref count: 0x%x\n", - cRefs); - DBC_Ensure(cRefs >= 0); return true; diff --git a/drivers/dsp/bridge/pmgr/wcd.c b/drivers/dsp/bridge/pmgr/wcd.c index beea23b..9f2bdf5 100644 --- a/drivers/dsp/bridge/pmgr/wcd.c +++ b/drivers/dsp/bridge/pmgr/wcd.c @@ -279,8 +279,7 @@ void WCD_Exit(void) { DBC_Require(WCD_cRefs > 0); WCD_cRefs--; - GT_1trace(WCD_debugMask, GT_5CLASS, - "Entered WCD_Exit, ref count: 0x%x\n", WCD_cRefs); + if (WCD_cRefs == 0) { /* Release all WCD modules initialized in WCD_Init(). */ COD_Exit(); @@ -372,8 +371,6 @@ bool WCD_Init(void) if (fInit) WCD_cRefs++; - GT_1trace(WCD_debugMask, GT_5CLASS, - "Entered WCD_Init, ref count: 0x%x\n", WCD_cRefs); return fInit; } @@ -400,7 +397,7 @@ DSP_STATUS WCD_InitComplete2(void) u32 devType; DBC_Require(WCD_cRefs > 0); - GT_0trace(WCD_debugMask, GT_ENTER, "Entered WCD_InitComplete\n"); + /* Walk the list of DevObjects, get each devnode, and attempting to * autostart the board. Note that this requires COF loading, which * requires KFILE. */ @@ -424,8 +421,7 @@ DSP_STATUS WCD_InitComplete2(void) "Ignoring PROC_AutoStart " "for Device Type = 0x%x \n", devType); } /* End For Loop */ - GT_1trace(WCD_debugMask, GT_ENTER, - "Exiting WCD_InitComplete status 0x%x\n", status); + return status; } @@ -441,14 +437,6 @@ u32 MGRWRAP_EnumNode_Info(union Trapped_Args *args, void *pr_ctxt) DSP_STATUS status = DSP_SOK; u32 size = args->ARGS_MGR_ENUMNODE_INFO.uNDBPropsSize; - GT_4trace(WCD_debugMask, GT_ENTER, - "MGR_EnumNodeInfo: entered args:\n0x%x" - " uNode: 0x%x\tpNDBProps: 0x%x\tuNDBPropsSize: " - "0x%x\tpuNumNodes\n", args->ARGS_MGR_ENUMNODE_INFO.uNode, - args->ARGS_MGR_ENUMNODE_INFO.pNDBProps, - args->ARGS_MGR_ENUMNODE_INFO.uNDBPropsSize, - args->ARGS_MGR_ENUMNODE_INFO.puNumNodes); - if (size < sizeof(struct DSP_NDBPROPS)) return DSP_ESIZE; @@ -480,15 +468,6 @@ u32 MGRWRAP_EnumProc_Info(union Trapped_Args *args, void *pr_ctxt) DSP_STATUS status = DSP_SOK; u32 size = args->ARGS_MGR_ENUMPROC_INFO.uProcessorInfoSize; - GT_4trace(WCD_debugMask, GT_ENTER, - "MGRWRAP_EnumProc_Info: entered args:\n" - "0x%x uProcessor: 0x%x\tpProcessorInfo: 0x%x\t" - "uProcessorInfoSize: 0x%x\tpuNumProcs \n", - args->ARGS_MGR_ENUMPROC_INFO.uProcessor, - args->ARGS_MGR_ENUMPROC_INFO.pProcessorInfo, - args->ARGS_MGR_ENUMPROC_INFO.uProcessorInfoSize, - args->ARGS_MGR_ENUMPROC_INFO.puNumProcs); - if (size < sizeof(struct DSP_PROCESSORINFO)) return DSP_ESIZE; @@ -523,11 +502,6 @@ u32 MGRWRAP_RegisterObject(union Trapped_Args *args, void *pr_ctxt) char *pszPathName = NULL; DSP_STATUS status = DSP_SOK; - - GT_1trace(WCD_debugMask, GT_ENTER, - "MGRWRAP_RegisterObject: entered " - "0x%x\n", args->ARGS_MGR_REGISTEROBJECT.pUuid); - cp_fm_usr(&pUuid, args->ARGS_MGR_REGISTEROBJECT.pUuid, status, 1); if (DSP_FAILED(status)) goto func_end; @@ -568,9 +542,6 @@ u32 MGRWRAP_UnregisterObject(union Trapped_Args *args, void *pr_ctxt) if (DSP_FAILED(status)) goto func_end; - GT_1trace(WCD_debugMask, GT_ENTER, - "MGRWRAP_UnregisterObject: entered pg2hMsg" - " 0x%x\n", args->ARGS_MGR_UNREGISTEROBJECT.pUuid); status = DCD_UnregisterObject(&pUuid, args->ARGS_MGR_UNREGISTEROBJECT.objType); func_end: @@ -589,9 +560,6 @@ u32 MGRWRAP_WaitForBridgeEvents(union Trapped_Args *args, void *pr_ctxt) u32 uIndex, i; u32 uCount = args->ARGS_MGR_WAIT.uCount; - GT_0trace(WCD_debugMask, GT_ENTER, - "MGRWRAP_WaitForBridgeEvents: entered\n"); - if (uCount > MAX_EVENTS) status = DSP_EINVALIDARG; @@ -635,12 +603,6 @@ u32 PROCWRAP_Attach(union Trapped_Args *args, void *pr_ctxt) DSP_STATUS status = DSP_SOK; struct DSP_PROCESSORATTRIN attrIn, *pAttrIn = NULL; - GT_3trace(WCD_debugMask, GT_ENTER, - "PROCWRAP_Attach: entered args:\n" "0x%x" - " uProcessor: 0x%x\tpAttrIn: 0x%x\tphProcessor \n", - args->ARGS_PROC_ATTACH.uProcessor, - args->ARGS_PROC_ATTACH.pAttrIn, - args->ARGS_PROC_ATTACH.phProcessor); /* Optional argument */ if (args->ARGS_PROC_ATTACH.pAttrIn) { cp_fm_usr(&attrIn, args->ARGS_PROC_ATTACH.pAttrIn, status, 1); @@ -668,12 +630,6 @@ u32 PROCWRAP_Ctrl(union Trapped_Args *args, void *pr_ctxt) u8 *pArgs = NULL; DSP_STATUS status = DSP_SOK; - GT_3trace(WCD_debugMask, GT_ENTER, - "PROCWRAP_Ctrl: entered args:\n 0x%x" - " uProcessor: 0x%x\tdwCmd: 0x%x\tpArgs \n", - args->ARGS_PROC_CTRL.hProcessor, - args->ARGS_PROC_CTRL.dwCmd, - args->ARGS_PROC_CTRL.pArgs); if (pSize) { if (get_user(cbDataSize, pSize)) { status = DSP_EFAIL; @@ -721,16 +677,6 @@ u32 PROCWRAP_EnumNode_Info(union Trapped_Args *args, void *pr_ctxt) u32 uNumNodes; u32 uAllocated; - GT_5trace(WCD_debugMask, GT_ENTER, - "PROCWRAP_EnumNode_Info:entered args:\n0x" - "%xhProcessor:0x%x\taNodeTab:0x%x\tuNodeTabSize:" - "%0x%x\tpuNumNodes%\n0x%x puAllocated: \n", - args->ARGS_PROC_ENUMNODE_INFO.hProcessor, - args->ARGS_PROC_ENUMNODE_INFO.aNodeTab, - args->ARGS_PROC_ENUMNODE_INFO.uNodeTabSize, - args->ARGS_PROC_ENUMNODE_INFO.puNumNodes, - args->ARGS_PROC_ENUMNODE_INFO.puAllocated); - if (!args->ARGS_PROC_ENUMNODE_INFO.uNodeTabSize) return DSP_ESIZE; @@ -754,8 +700,6 @@ u32 PROCWRAP_FlushMemory(union Trapped_Args *args, void *pr_ctxt) { DSP_STATUS status; - GT_0trace(WCD_debugMask, GT_ENTER, "PROCWRAP_FlushMemory: entered\n"); - if (args->ARGS_PROC_FLUSHMEMORY.ulFlags > PROC_WRITEBACK_INVALIDATE_MEM) return DSP_EINVALIDARG; @@ -775,9 +719,6 @@ u32 PROCWRAP_InvalidateMemory(union Trapped_Args *args, void *pr_ctxt) { DSP_STATUS status; - GT_0trace(WCD_debugMask, GT_ENTER, - "PROCWRAP_InvalidateMemory:entered\n"); - status = PROC_InvalidateMemory( args->ARGS_PROC_INVALIDATEMEMORY.hProcessor, args->ARGS_PROC_INVALIDATEMEMORY.pMpuAddr, @@ -794,15 +735,6 @@ u32 PROCWRAP_EnumResources(union Trapped_Args *args, void *pr_ctxt) DSP_STATUS status = DSP_SOK; struct DSP_RESOURCEINFO pResourceInfo; - GT_4trace(WCD_debugMask, GT_ENTER, - "PROCWRAP_EnumResources: entered args:\n" - "0x%x hProcessor: 0x%x\tuResourceMask: 0x%x\tpResourceInfo" - " 0x%x\tuResourceInfoSixe \n", - args->ARGS_PROC_ENUMRESOURCES.hProcessor, - args->ARGS_PROC_ENUMRESOURCES.uResourceType, - args->ARGS_PROC_ENUMRESOURCES.pResourceInfo, - args->ARGS_PROC_ENUMRESOURCES.uResourceInfoSize); - if (args->ARGS_PROC_ENUMRESOURCES.uResourceInfoSize < sizeof(struct DSP_RESOURCEINFO)) return DSP_ESIZE; @@ -826,7 +758,6 @@ u32 PROCWRAP_GetState(union Trapped_Args *args, void *pr_ctxt) { DSP_STATUS status; struct DSP_PROCESSORSTATE procStatus; - GT_0trace(WCD_debugMask, GT_ENTER, "PROCWRAP_GetState: entered\n"); if (args->ARGS_PROC_GETSTATE.uStateInfoSize < sizeof(struct DSP_PROCESSORSTATE)) @@ -847,8 +778,6 @@ u32 PROCWRAP_GetTrace(union Trapped_Args *args, void *pr_ctxt) DSP_STATUS status; u8 *pBuf; - GT_0trace(WCD_debugMask, GT_ENTER, "PROCWRAP_GetTrace: entered\n"); - if (args->ARGS_PROC_GETTRACE.uMaxSize > MAX_TRACEBUFLEN) return DSP_ESIZE; @@ -956,12 +885,7 @@ u32 PROCWRAP_Load(union Trapped_Args *args, void *pr_ctxt) } } } - GT_5trace(WCD_debugMask, GT_ENTER, - "PROCWRAP_Load, hProcessor: 0x%x\n\tiArgc:" - "0x%x\n\taArgv: 0x%x\n\taArgv[0]: %s\n\taEnvp: 0x%0x\n", - args->ARGS_PROC_LOAD.hProcessor, - args->ARGS_PROC_LOAD.iArgc, args->ARGS_PROC_LOAD.aArgv, - argv[0], args->ARGS_PROC_LOAD.aEnvp); + if (DSP_SUCCEEDED(status)) { status = PROC_Load(args->ARGS_PROC_LOAD.hProcessor, args->ARGS_PROC_LOAD.iArgc, @@ -995,8 +919,6 @@ u32 PROCWRAP_Map(union Trapped_Args *args, void *pr_ctxt) DSP_STATUS status; void *pMapAddr; - GT_0trace(WCD_debugMask, GT_ENTER, "PROCWRAP_Map: entered\n"); - if (!args->ARGS_PROC_MAPMEM.ulSize) return DSP_ESIZE; @@ -1024,9 +946,6 @@ u32 PROCWRAP_RegisterNotify(union Trapped_Args *args, void *pr_ctxt) DSP_STATUS status; struct DSP_NOTIFICATION notification; - GT_0trace(WCD_debugMask, GT_ENTER, - "PROCWRAP_RegisterNotify: entered\n"); - /* Initialize the notification data structure */ notification.psName = NULL; notification.handle = NULL; @@ -1052,7 +971,6 @@ u32 PROCWRAP_ReserveMemory(union Trapped_Args *args, void *pr_ctxt) (args->ARGS_PROC_RSVMEM.ulSize & (PG_SIZE_4K - 1)) != 0) return DSP_ESIZE; - GT_0trace(WCD_debugMask, GT_ENTER, "PROCWRAP_ReserveMemory: entered\n"); status = PROC_ReserveMemory(args->ARGS_PROC_RSVMEM.hProcessor, args->ARGS_PROC_RSVMEM.ulSize, &pRsvAddr); if (DSP_SUCCEEDED(status)) { @@ -1072,7 +990,6 @@ u32 PROCWRAP_Start(union Trapped_Args *args, void *pr_ctxt) { u32 retVal; - GT_0trace(WCD_debugMask, GT_ENTER, "PROCWRAP_Start: entered\n"); retVal = PROC_Start(args->ARGS_PROC_START.hProcessor); return retVal; } @@ -1084,7 +1001,6 @@ u32 PROCWRAP_UnMap(union Trapped_Args *args, void *pr_ctxt) { DSP_STATUS status; - GT_0trace(WCD_debugMask, GT_ENTER, "PROCWRAP_UnMap: entered\n"); status = PROC_UnMap(args->ARGS_PROC_UNMAPMEM.hProcessor, args->ARGS_PROC_UNMAPMEM.pMapAddr, pr_ctxt); return status; @@ -1097,8 +1013,6 @@ u32 PROCWRAP_UnReserveMemory(union Trapped_Args *args, void *pr_ctxt) { DSP_STATUS status; - GT_0trace(WCD_debugMask, GT_ENTER, - "PROCWRAP_UnReserveMemory: entered\n"); status = PROC_UnReserveMemory(args->ARGS_PROC_UNRSVMEM.hProcessor, args->ARGS_PROC_UNRSVMEM.pRsvAddr); return status; @@ -1111,7 +1025,6 @@ u32 PROCWRAP_Stop(union Trapped_Args *args, void *pr_ctxt) { u32 retVal; - GT_0trace(WCD_debugMask, GT_ENTER, "PROCWRAP_Stop: entered\n"); retVal = PROC_Stop(args->ARGS_PROC_STOP.hProcessor); return retVal; @@ -1130,8 +1043,6 @@ u32 NODEWRAP_Allocate(union Trapped_Args *args, void *pr_ctxt) struct DSP_NODEATTRIN attrIn, *pAttrIn = NULL; struct NODE_OBJECT *hNode; - GT_0trace(WCD_debugMask, GT_ENTER, "NODEWRAP_Allocate: entered\n"); - /* Optional argument */ if (pSize) { if (get_user(cbDataSize, pSize)) @@ -1214,8 +1125,6 @@ u32 NODEWRAP_ChangePriority(union Trapped_Args *args, void *pr_ctxt) { u32 retVal; - GT_0trace(WCD_debugMask, GT_ENTER, - "NODEWRAP_ChangePriority: entered\n"); retVal = NODE_ChangePriority(args->ARGS_NODE_CHANGEPRIORITY.hNode, args->ARGS_NODE_CHANGEPRIORITY.iPriority); @@ -1234,8 +1143,6 @@ u32 NODEWRAP_Connect(union Trapped_Args *args, void *pr_ctxt) u32 __user *pSize = (u32 __user *)args->ARGS_NODE_CONNECT.pConnParam; u8 *pArgs = NULL; - GT_0trace(WCD_debugMask, GT_ENTER, "NODEWRAP_Connect: entered\n"); - /* Optional argument */ if (pSize) { if (get_user(cbDataSize, pSize)) @@ -1281,7 +1188,6 @@ u32 NODEWRAP_Create(union Trapped_Args *args, void *pr_ctxt) { u32 retVal; - GT_0trace(WCD_debugMask, GT_ENTER, "NODEWRAP_Create: entered\n"); retVal = NODE_Create(args->ARGS_NODE_CREATE.hNode); return retVal; @@ -1294,7 +1200,6 @@ u32 NODEWRAP_Delete(union Trapped_Args *args, void *pr_ctxt) { u32 retVal; - GT_0trace(WCD_debugMask, GT_ENTER, "NODEWRAP_Delete: entered\n"); retVal = NODE_Delete(args->ARGS_NODE_DELETE.hNode, pr_ctxt); return retVal; @@ -1335,8 +1240,6 @@ u32 NODEWRAP_GetAttr(union Trapped_Args *args, void *pr_ctxt) DSP_STATUS status = DSP_SOK; struct DSP_NODEATTR attr; - GT_0trace(WCD_debugMask, GT_ENTER, "NODEWRAP_GetAttr: entered\n"); - status = NODE_GetAttr(args->ARGS_NODE_GETATTR.hNode, &attr, args->ARGS_NODE_GETATTR.uAttrSize); cp_to_usr(args->ARGS_NODE_GETATTR.pAttr, &attr, status, 1); @@ -1352,8 +1255,6 @@ u32 NODEWRAP_GetMessage(union Trapped_Args *args, void *pr_ctxt) DSP_STATUS status; struct DSP_MSG msg; - GT_0trace(WCD_debugMask, GT_ENTER, "NODEWRAP_GetMessage: entered\n"); - status = NODE_GetMessage(args->ARGS_NODE_GETMESSAGE.hNode, &msg, args->ARGS_NODE_GETMESSAGE.uTimeout); @@ -1369,7 +1270,6 @@ u32 NODEWRAP_Pause(union Trapped_Args *args, void *pr_ctxt) { u32 retVal; - GT_0trace(WCD_debugMask, GT_ENTER, "NODEWRAP_Pause: entered\n"); retVal = NODE_Pause(args->ARGS_NODE_PAUSE.hNode); return retVal; @@ -1383,8 +1283,6 @@ u32 NODEWRAP_PutMessage(union Trapped_Args *args, void *pr_ctxt) DSP_STATUS status = DSP_SOK; struct DSP_MSG msg; - GT_0trace(WCD_debugMask, GT_ENTER, "NODEWRAP_PutMessage: entered\n"); - cp_fm_usr(&msg, args->ARGS_NODE_PUTMESSAGE.pMessage, status, 1); if (DSP_SUCCEEDED(status)) { @@ -1403,9 +1301,6 @@ u32 NODEWRAP_RegisterNotify(union Trapped_Args *args, void *pr_ctxt) DSP_STATUS status = DSP_SOK; struct DSP_NOTIFICATION notification; - GT_0trace(WCD_debugMask, GT_ENTER, - "NODEWRAP_RegisterNotify: entered\n"); - /* Initialize the notification data structure */ notification.psName = NULL; notification.handle = NULL; @@ -1431,7 +1326,6 @@ u32 NODEWRAP_Run(union Trapped_Args *args, void *pr_ctxt) { u32 retVal; - GT_0trace(WCD_debugMask, GT_ENTER, "NODEWRAP_Run: entered\n"); retVal = NODE_Run(args->ARGS_NODE_RUN.hNode); return retVal; @@ -1445,8 +1339,6 @@ u32 NODEWRAP_Terminate(union Trapped_Args *args, void *pr_ctxt) DSP_STATUS status; DSP_STATUS tempstatus; - GT_0trace(WCD_debugMask, GT_ENTER, "NODEWRAP_Terminate: entered\n"); - status = NODE_Terminate(args->ARGS_NODE_TERMINATE.hNode, &tempstatus); cp_to_usr(args->ARGS_NODE_TERMINATE.pStatus, &tempstatus, status, 1); @@ -1464,9 +1356,6 @@ u32 NODEWRAP_GetUUIDProps(union Trapped_Args *args, void *pr_ctxt) struct DSP_UUID nodeId; struct DSP_NDBPROPS *pnodeProps = NULL; - GT_0trace(WCD_debugMask, GT_ENTER, - "NODEWRAP_GetUUIDPropste: entered\n"); - cp_fm_usr(&nodeId, args->ARGS_NODE_GETUUIDPROPS.pNodeID, status, 1); if (DSP_FAILED(status)) goto func_cont; @@ -1684,9 +1573,6 @@ u32 STRMWRAP_RegisterNotify(union Trapped_Args *args, void *pr_ctxt) DSP_STATUS status = DSP_SOK; struct DSP_NOTIFICATION notification; - GT_0trace(WCD_debugMask, GT_ENTER, - "NODEWRAP_RegisterNotify: entered\n"); - /* Initialize the notification data structure */ notification.psName = NULL; notification.handle = NULL; -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 04/18] DSPBRIDGE: Remove entry point custom debug statements for wmd 2010-02-16 8:42 ` [PATCH 03/18] DSPBRIDGE: Remove entry point custom debug statements for pmgr Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 05/18] DSPBRIDGE: Remove debug statements for success in rmgr Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna Remove statements using GT_ENTER custom bridge level which is used to print entry and exit points from functions. Few meaningful prints were left for reference when migrating to dev_dbg. This changes are split to touch services folder only. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/services/cfg.c | 38 +++++++------------------------ drivers/dsp/bridge/services/clk.c | 16 +------------ drivers/dsp/bridge/services/dbg.c | 4 +-- drivers/dsp/bridge/services/mem.c | 13 ----------- drivers/dsp/bridge/services/ntfy.c | 4 +-- drivers/dsp/bridge/services/reg.c | 10 -------- drivers/dsp/bridge/services/services.c | 3 -- drivers/dsp/bridge/services/sync.c | 37 +------------------------------ 8 files changed, 13 insertions(+), 112 deletions(-) diff --git a/drivers/dsp/bridge/services/cfg.c b/drivers/dsp/bridge/services/cfg.c index 56d03a3..7b2a896 100644 --- a/drivers/dsp/bridge/services/cfg.c +++ b/drivers/dsp/bridge/services/cfg.c @@ -48,7 +48,7 @@ static struct GT_Mask CFG_debugMask = { NULL, NULL }; /* CFG debug Mask */ */ void CFG_Exit(void) { - GT_0trace(CFG_debugMask, GT_5CLASS, "Entered CFG_Exit\n"); + /* Do nothing */ } /* @@ -61,9 +61,7 @@ DSP_STATUS CFG_GetAutoStart(struct CFG_DEVNODE *hDevNode, { DSP_STATUS status = DSP_SOK; u32 dwBufSize; - GT_2trace(CFG_debugMask, GT_ENTER, - "Entered CFG_GetAutoStart: \n\thDevNode:" - "0x%x\n\tpdwAutoStart: 0x%x\n", hDevNode, pdwAutoStart); + dwBufSize = sizeof(*pdwAutoStart); if (!hDevNode) status = CFG_E_INVALIDHDEVNODE; @@ -99,9 +97,7 @@ DSP_STATUS CFG_GetDevObject(struct CFG_DEVNODE *hDevNode, OUT u32 *pdwValue) { DSP_STATUS status = DSP_SOK; u32 dwBufSize; - GT_2trace(CFG_debugMask, GT_ENTER, "Entered CFG_GetDevObject, args: " - "\n\thDevNode: 0x%x\n\tpdwValue: 0x%x\n", hDevNode, - *pdwValue); + if (!hDevNode) status = CFG_E_INVALIDHDEVNODE; @@ -147,10 +143,7 @@ DSP_STATUS CFG_GetDSPResources(struct CFG_DEVNODE *hDevNode, { DSP_STATUS status = DSP_SOK; /* return value */ u32 dwResSize; - GT_2trace(CFG_debugMask, GT_ENTER, - "Entered CFG_GetDSPResources, args: " - "\n\thDevNode: 0x%x\n\tpDSPResTable: 0x%x\n", - hDevNode, pDSPResTable); + if (!hDevNode) { status = CFG_E_INVALIDHDEVNODE; } else if (!pDSPResTable) { @@ -188,10 +181,7 @@ DSP_STATUS CFG_GetExecFile(struct CFG_DEVNODE *hDevNode, u32 ulBufSize, { DSP_STATUS status = DSP_SOK; u32 cExecSize = ulBufSize; - GT_3trace(CFG_debugMask, GT_ENTER, - "Entered CFG_GetExecFile:\n\tthDevNode: " - "0x%x\n\tulBufSize: 0x%x\n\tpstrExecFile: 0x%x\n", hDevNode, - ulBufSize, pstrExecFile); + if (!hDevNode) status = CFG_E_INVALIDHDEVNODE; else if (!pstrExecFile) @@ -230,10 +220,7 @@ DSP_STATUS CFG_GetHostResources(struct CFG_DEVNODE *hDevNode, { DSP_STATUS status = DSP_SOK; u32 dwBufSize; - GT_2trace(CFG_debugMask, GT_ENTER, - "Entered CFG_GetHostResources, args:\n\t" - "pHostResTable: 0x%x\n\thDevNode: 0x%x\n", - pHostResTable, hDevNode); + if (!hDevNode) status = CFG_E_INVALIDHDEVNODE; @@ -269,9 +256,7 @@ DSP_STATUS CFG_GetObject(OUT u32 *pdwValue, u32 dwType) DSP_STATUS status = DSP_EINVALIDARG; u32 dwBufSize; DBC_Require(pdwValue != NULL); - GT_1trace(CFG_debugMask, GT_ENTER, - "Entered CFG_GetObject, args:pdwValue: " - "0x%x\n", *pdwValue); + dwBufSize = sizeof(pdwValue); switch (dwType) { case (REG_DRV_OBJECT): @@ -309,7 +294,6 @@ bool CFG_Init(void) { struct CFG_DSPRES dspResources; GT_create(&CFG_debugMask, "CF"); /* CF for ConFig */ - GT_0trace(CFG_debugMask, GT_5CLASS, "Entered CFG_Init\n"); GT_0trace(CFG_debugMask, GT_5CLASS, "Intializing DSP Registry Info \n"); dspResources.uChipType = DSPTYPE_64; @@ -340,9 +324,7 @@ DSP_STATUS CFG_SetDevObject(struct CFG_DEVNODE *hDevNode, u32 dwValue) { DSP_STATUS status = DSP_SOK; u32 dwBuffSize; - GT_2trace(CFG_debugMask, GT_ENTER, - "Entered CFG_SetDevObject, args: \n\t" - "hDevNode: 0x%x\n\tdwValue: 0x%x\n", hDevNode, dwValue); + if (!hDevNode) status = CFG_E_INVALIDHDEVNODE; @@ -381,9 +363,7 @@ DSP_STATUS CFG_SetObject(u32 dwValue, u32 dwType) { DSP_STATUS status = DSP_EINVALIDARG; u32 dwBuffSize; - GT_1trace(CFG_debugMask, GT_ENTER, - "Entered CFG_SetObject, args: dwValue: " - "0x%x\n", dwValue); + dwBuffSize = sizeof(dwValue); switch (dwType) { case (REG_DRV_OBJECT): diff --git a/drivers/dsp/bridge/services/clk.c b/drivers/dsp/bridge/services/clk.c index 1be25cd..041e789 100644 --- a/drivers/dsp/bridge/services/clk.c +++ b/drivers/dsp/bridge/services/clk.c @@ -104,7 +104,6 @@ void CLK_Exit(void) { int i = 0; - GT_0trace(CLK_debugMask, GT_5CLASS, "CLK_Exit\n"); /* Relinquish the clock handles */ while (i < SERVICESCLK_NOT_DEFINED) { if (SERVICES_Clks[i].clk_handle) @@ -127,7 +126,6 @@ bool CLK_Init(void) struct clk *clk_handle; int i = 0; GT_create(&CLK_debugMask, "CK"); /* CK for CLK */ - GT_0trace(CLK_debugMask, GT_5CLASS, "CLK_Init\n"); dspbridge_device.dev.bus = &platform_bus_type; @@ -172,9 +170,6 @@ DSP_STATUS CLK_Enable(IN enum SERVICES_ClkId clk_id) struct clk *pClk; DBC_Require(clk_id < SERVICESCLK_NOT_DEFINED); - GT_2trace(CLK_debugMask, GT_6CLASS, "CLK_Enable: CLK %s, " - "CLK dev id = %d\n", SERVICES_Clks[clk_id].clk_name, - SERVICES_Clks[clk_id].id); pClk = SERVICES_Clks[clk_id].clk_handle; if (pClk) { @@ -215,10 +210,7 @@ DSP_STATUS CLK_Set_32KHz(IN enum SERVICES_ClkId clk_id) pClkParent = SERVICES_Clks[SERVICESCLK_sys_32k_ck].clk_handle; DBC_Require(clk_id < SERVICESCLK_NOT_DEFINED); - GT_2trace(CLK_debugMask, GT_6CLASS, "CLK_Set_32KHz: CLK %s, " - "CLK dev id = %d is setting to 32KHz \n", - SERVICES_Clks[clk_id].clk_name, - SERVICES_Clks[clk_id].id); + pClk = SERVICES_Clks[clk_id].clk_handle; if (pClk) { if (!(clk_set_parent(pClk, pClkParent) == 0x0)) { @@ -245,9 +237,6 @@ DSP_STATUS CLK_Disable(IN enum SERVICES_ClkId clk_id) s32 clkUseCnt; DBC_Require(clk_id < SERVICESCLK_NOT_DEFINED); - GT_2trace(CLK_debugMask, GT_6CLASS, "CLK_Disable: CLK %s, " - "CLK dev id = %d\n", SERVICES_Clks[clk_id].clk_name, - SERVICES_Clks[clk_id].id); pClk = SERVICES_Clks[clk_id].clk_handle; @@ -295,9 +284,6 @@ DSP_STATUS CLK_GetRate(IN enum SERVICES_ClkId clk_id, u32 *speedKhz) DBC_Require(clk_id < SERVICESCLK_NOT_DEFINED); *speedKhz = 0x0; - GT_2trace(CLK_debugMask, GT_7CLASS, "CLK_GetRate: CLK %s, " - "CLK dev Id = %d \n", SERVICES_Clks[clk_id].clk_name, - SERVICES_Clks[clk_id].id); pClk = SERVICES_Clks[clk_id].clk_handle; if (pClk) { clkSpeedHz = clk_get_rate(pClk); diff --git a/drivers/dsp/bridge/services/dbg.c b/drivers/dsp/bridge/services/dbg.c index 93fd817..a70297d 100644 --- a/drivers/dsp/bridge/services/dbg.c +++ b/drivers/dsp/bridge/services/dbg.c @@ -44,8 +44,6 @@ bool DBG_Init(void) { GT_create(&DBG_debugMask, "WD"); /* for WmD (link driver) debug */ - GT_0trace(DBG_debugMask, GT_5CLASS, "DBG_Init\n"); - return true; } @@ -84,7 +82,7 @@ DSP_STATUS DBG_Trace(u8 bLevel, char *pstrFormat, ...) */ void DBG_Exit(void) { - GT_0trace(DBG_debugMask, GT_5CLASS, "DBG_Exit\n"); + /* Do nothing */ } #endif /* (CONFIG_BRIDGE_DEBUG || DDSP_DEBUG_PRODUCT) && GT_TRACE */ diff --git a/drivers/dsp/bridge/services/mem.c b/drivers/dsp/bridge/services/mem.c index 57f1794..852f9d3 100644 --- a/drivers/dsp/bridge/services/mem.c +++ b/drivers/dsp/bridge/services/mem.c @@ -151,8 +151,6 @@ void *MEM_Alloc(u32 cBytes, enum MEM_POOLATTRS type) { void *pMem = NULL; - GT_2trace(MEM_debugMask, GT_ENTER, - "MEM_Alloc: cBytes 0x%x\ttype 0x%x\n", cBytes, type); if (cBytes > 0) { switch (type) { case MEM_NONPAGED: @@ -186,10 +184,6 @@ void *MEM_AllocPhysMem(u32 cBytes, u32 ulAlign, OUT u32 *pPhysicalAddress) void *pVaMem = NULL; dma_addr_t paMem; - GT_2trace(MEM_debugMask, GT_ENTER, - "MEM_AllocPhysMem: cBytes 0x%x\tulAlign" - "0x%x\n", cBytes, ulAlign); - if (cBytes > 0) { if (extPhysMemPoolEnabled) { pVaMem = MEM_ExtPhysMemAlloc(cBytes, ulAlign, @@ -218,10 +212,6 @@ void *MEM_Calloc(u32 cBytes, enum MEM_POOLATTRS type) { void *pMem = NULL; - GT_2trace(MEM_debugMask, GT_ENTER, - "MEM_Calloc: cBytes 0x%x\ttype 0x%x\n", - cBytes, type); - if (cBytes > 0) { switch (type) { case MEM_NONPAGED: @@ -301,9 +291,6 @@ void MEM_FreePhysMem(void *pVirtualAddress, u32 pPhysicalAddress, { DBC_Require(pVirtualAddress != NULL); - GT_1trace(MEM_debugMask, GT_ENTER, "MEM_FreePhysMem: pVirtualAddress " - "0x%x\n", pVirtualAddress); - if (!extPhysMemPoolEnabled) dma_free_coherent(NULL, cBytes, pVirtualAddress, pPhysicalAddress); diff --git a/drivers/dsp/bridge/services/ntfy.c b/drivers/dsp/bridge/services/ntfy.c index 53a6974..a0abd56 100644 --- a/drivers/dsp/bridge/services/ntfy.c +++ b/drivers/dsp/bridge/services/ntfy.c @@ -148,7 +148,7 @@ void NTFY_Delete(struct NTFY_OBJECT *hNtfy) */ void NTFY_Exit(void) { - GT_0trace(NTFY_debugMask, GT_5CLASS, "Entered NTFY_Exit\n"); + /* Do nothing */ } /* @@ -160,8 +160,6 @@ bool NTFY_Init(void) { GT_create(&NTFY_debugMask, "NY"); /* "NY" for NtfY */ - GT_0trace(NTFY_debugMask, GT_5CLASS, "NTFY_Init()\n"); - return true; } diff --git a/drivers/dsp/bridge/services/reg.c b/drivers/dsp/bridge/services/reg.c index 7a375be..36c1519 100644 --- a/drivers/dsp/bridge/services/reg.c +++ b/drivers/dsp/bridge/services/reg.c @@ -49,8 +49,6 @@ DSP_STATUS REG_DeleteValue(IN CONST char *pstrValue) DSP_STATUS status; DBC_Require(strlen(pstrValue) < REG_MAXREGPATHLENGTH); - GT_0trace(REG_debugMask, GT_ENTER, "REG_DeleteValue: entered\n"); - status = regsupDeleteValue(pstrValue); return status; @@ -74,8 +72,6 @@ DSP_STATUS REG_EnumValue(IN u32 dwIndex, DBC_Require(*pdwValueSize <= REG_MAXREGPATHLENGTH); DBC_Require(strlen(pstrKey) < REG_MAXREGPATHLENGTH); - GT_0trace(REG_debugMask, GT_ENTER, "REG_EnumValue: entered\n"); - status = regsupEnumValue(dwIndex, pstrKey, pstrValue, pdwValueSize, pstrData, pdwDataSize); @@ -88,8 +84,6 @@ DSP_STATUS REG_EnumValue(IN u32 dwIndex, */ void REG_Exit(void) { - GT_0trace(REG_debugMask, GT_5CLASS, "REG_Exit\n"); - regsupExit(); } @@ -105,8 +99,6 @@ DSP_STATUS REG_GetValue(IN CONST char *pstrValue, OUT u8 *pbData, DBC_Require(pstrValue && pbData); DBC_Require(strlen(pstrValue) < REG_MAXREGPATHLENGTH); - GT_0trace(REG_debugMask, GT_ENTER, "REG_GetValue: entered\n"); - /* We need to use regsup calls... */ /* ...for now we don't need the key handle or */ /* the subkey, all we need is the value to lookup. */ @@ -130,8 +122,6 @@ bool REG_Init(void) fInit = regsupInit(); - GT_0trace(REG_debugMask, GT_5CLASS, "REG_Init\n"); - return fInit; } diff --git a/drivers/dsp/bridge/services/services.c b/drivers/dsp/bridge/services/services.c index 3db08e4..8a30ac6 100644 --- a/drivers/dsp/bridge/services/services.c +++ b/drivers/dsp/bridge/services/services.c @@ -77,9 +77,6 @@ bool SERVICES_Init(void) GT_init(); GT_create(&SERVICES_debugMask, "OS"); /* OS for OSal */ - GT_0trace(SERVICES_debugMask, GT_ENTER, - "SERVICES_Init: entered\n"); - /* Perform required initialization of SERVICES modules. */ fMEM = MEM_Init(); fREG = REG_Init(); diff --git a/drivers/dsp/bridge/services/sync.c b/drivers/dsp/bridge/services/sync.c index 7fb5553..3ba97ca 100644 --- a/drivers/dsp/bridge/services/sync.c +++ b/drivers/dsp/bridge/services/sync.c @@ -93,9 +93,6 @@ DSP_STATUS SYNC_CloseEvent(struct SYNC_OBJECT *hEvent) DBC_Require(pEvent != NULL && pEvent->pWaitObj == NULL); - GT_1trace(SYNC_debugMask, GT_ENTER, "SYNC_CloseEvent: hEvent 0x%x\n", - hEvent); - if (MEM_IsValidHandle(hEvent, SIGNATURE)) { if (pEvent->pWaitObj) { status = DSP_EFAIL; @@ -121,7 +118,7 @@ DSP_STATUS SYNC_CloseEvent(struct SYNC_OBJECT *hEvent) */ void SYNC_Exit(void) { - GT_0trace(SYNC_debugMask, GT_5CLASS, "SYNC_Exit\n"); + /* Do nothing */ } /* @@ -133,8 +130,6 @@ bool SYNC_Init(void) { GT_create(&SYNC_debugMask, "SY"); /* SY for SYnc */ - GT_0trace(SYNC_debugMask, GT_5CLASS, "SYNC_Init\n"); - return true; } @@ -151,10 +146,6 @@ DSP_STATUS SYNC_OpenEvent(OUT struct SYNC_OBJECT **phEvent, DBC_Require(phEvent != NULL); - GT_2trace(SYNC_debugMask, GT_ENTER, - "SYNC_OpenEvent: phEvent 0x%x, pAttrs " - "0x%x\n", phEvent, pAttrs); - /* Allocate memory for sync object */ MEM_AllocObject(pEvent, struct SYNC_OBJECT, SIGNATURE); if (pEvent != NULL) { @@ -182,9 +173,6 @@ DSP_STATUS SYNC_ResetEvent(struct SYNC_OBJECT *hEvent) DSP_STATUS status = DSP_SOK; struct SYNC_OBJECT *pEvent = (struct SYNC_OBJECT *)hEvent; - GT_1trace(SYNC_debugMask, GT_ENTER, "SYNC_ResetEvent: hEvent 0x%x\n", - hEvent); - if (MEM_IsValidHandle(hEvent, SIGNATURE)) { pEvent->state = so_reset; } else { @@ -212,9 +200,6 @@ DSP_STATUS SYNC_SetEvent(struct SYNC_OBJECT *hEvent) struct SYNC_OBJECT *pEvent = (struct SYNC_OBJECT *)hEvent; unsigned long flags; - GT_1trace(SYNC_debugMask, GT_6CLASS, "SYNC_SetEvent: hEvent 0x%x\n", - hEvent); - if (MEM_IsValidHandle(hEvent, SIGNATURE)) { spin_lock_irqsave(&hEvent->sync_lock, flags); GT_1trace(SYNC_debugMask, GT_6CLASS, @@ -259,8 +244,6 @@ DSP_STATUS SYNC_WaitOnEvent(struct SYNC_OBJECT *hEvent, u32 dwTimeout) struct SYNC_OBJECT *pEvent = (struct SYNC_OBJECT *)hEvent; u32 temp; - GT_2trace(SYNC_debugMask, GT_6CLASS, "SYNC_WaitOnEvent: hEvent 0x%x\n, " - "dwTimeOut 0x%x", hEvent, dwTimeout); if (MEM_IsValidHandle(hEvent, SIGNATURE)) { status = SYNC_WaitOnMultipleEvents(&pEvent, 1, dwTimeout, &temp); @@ -295,11 +278,6 @@ DSP_STATUS SYNC_WaitOnMultipleEvents(struct SYNC_OBJECT **hSyncEvents, for (i = 0; i < uCount; i++) DBC_Require(MEM_IsValidHandle(hSyncEvents[i], SIGNATURE)); - GT_4trace(SYNC_debugMask, GT_6CLASS, - "SYNC_WaitOnMultipleEvents: hSyncEvents:" - "0x%x\tuCount: 0x%x" "\tdwTimeout: 0x%x\tpuIndex: 0x%x\n", - hSyncEvents, uCount, dwTimeout, puIndex); - Wp = MEM_Calloc(sizeof(struct WAIT_OBJECT), MEM_NONPAGED); if (Wp == NULL) return DSP_EMEMORY; @@ -395,8 +373,6 @@ DSP_STATUS SYNC_DeleteCS(struct SYNC_CSOBJECT *hCSObj) DSP_STATUS status = DSP_SOK; struct SYNC_CSOBJECT *pCSObj = (struct SYNC_CSOBJECT *)hCSObj; - GT_0trace(SYNC_debugMask, GT_ENTER, "SYNC_DeleteCS\n"); - if (MEM_IsValidHandle(hCSObj, SIGNATURECS)) { if (down_trylock(&pCSObj->sem) != 0) { GT_1trace(SYNC_debugMask, GT_7CLASS, @@ -433,8 +409,6 @@ DSP_STATUS SYNC_EnterCS(struct SYNC_CSOBJECT *hCSObj) DSP_STATUS status = DSP_SOK; struct SYNC_CSOBJECT *pCSObj = (struct SYNC_CSOBJECT *)hCSObj; - GT_1trace(SYNC_debugMask, GT_ENTER, "SYNC_EnterCS: hCSObj %p\n", - hCSObj); if (MEM_IsValidHandle(hCSObj, SIGNATURECS)) { if (in_interrupt()) { status = DSP_EFAIL; @@ -480,8 +454,6 @@ DSP_STATUS SYNC_InitializeCS(OUT struct SYNC_CSOBJECT **phCSObj) DSP_STATUS status = DSP_SOK; struct SYNC_CSOBJECT *pCSObj = NULL; - GT_0trace(SYNC_debugMask, GT_ENTER, "SYNC_InitializeCS\n"); - /* Allocate memory for sync CS object */ MEM_AllocObject(pCSObj, struct SYNC_CSOBJECT, SIGNATURECS); if (pCSObj != NULL) { @@ -505,8 +477,6 @@ DSP_STATUS SYNC_InitializeDPCCS(OUT struct SYNC_CSOBJECT **phCSObj) DBC_Require(phCSObj); - GT_0trace(SYNC_debugMask, GT_ENTER, "SYNC_InitializeDPCCS\n"); - if (phCSObj) { /* Allocate memory for sync CS object */ MEM_AllocObject(pCSObj, struct SYNC_DPCCSOBJECT, @@ -527,8 +497,6 @@ DSP_STATUS SYNC_InitializeDPCCS(OUT struct SYNC_CSOBJECT **phCSObj) status = DSP_EPOINTER; } - GT_1trace(SYNC_debugMask, GT_ENTER, "SYNC_InitializeDPCCS " - "pCSObj %p\n", pCSObj); DBC_Assert(DSP_FAILED(status) || (pCSObj)); return status; @@ -542,9 +510,6 @@ DSP_STATUS SYNC_LeaveCS(struct SYNC_CSOBJECT *hCSObj) DSP_STATUS status = DSP_SOK; struct SYNC_CSOBJECT *pCSObj = (struct SYNC_CSOBJECT *)hCSObj; - GT_1trace(SYNC_debugMask, GT_ENTER, "SYNC_LeaveCS: hCSObj %p\n", - hCSObj); - if (MEM_IsValidHandle(hCSObj, SIGNATURECS)) { up(&pCSObj->sem); } else if (MEM_IsValidHandle(hCSObj, SIGNATUREDPCCS)) { -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 05/18] DSPBRIDGE: Remove debug statements for success in rmgr 2010-02-16 8:42 ` [PATCH 04/18] DSPBRIDGE: Remove entry point custom debug statements for wmd Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 06/18] DSPBRIDGE: Remove debug statements for success in wmd Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna This patch removes debug statements used to print a successful status or printed during normal execution, as they just polute the logs if trying to look for a failure. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/rmgr/dbdcd.c | 14 +------- drivers/dsp/bridge/rmgr/disp.c | 6 +--- drivers/dsp/bridge/rmgr/drv.c | 45 +++-------------------- drivers/dsp/bridge/rmgr/drv_interface.c | 17 ++------- drivers/dsp/bridge/rmgr/dspdrv.c | 9 +---- drivers/dsp/bridge/rmgr/mgr.c | 2 - drivers/dsp/bridge/rmgr/node.c | 60 ++++++------------------------- drivers/dsp/bridge/rmgr/proc.c | 42 +++------------------- 8 files changed, 29 insertions(+), 166 deletions(-) diff --git a/drivers/dsp/bridge/rmgr/dbdcd.c b/drivers/dsp/bridge/rmgr/dbdcd.c index 4e5e7f9..0a59a62 100644 --- a/drivers/dsp/bridge/rmgr/dbdcd.c +++ b/drivers/dsp/bridge/rmgr/dbdcd.c @@ -165,10 +165,6 @@ DSP_STATUS DCD_CreateManager(IN char *pszZlDllName, /* Return handle to this DCD interface. */ *phDcdMgr = pDcdMgr; - - GT_2trace(curTrace, GT_5CLASS, - "DCD_CreateManager: pDcdMgr 0x%x, " - " hCodMgr 0x%x", pDcdMgr, hCodMgr); } else { status = DSP_EMEMORY; @@ -607,8 +603,6 @@ DSP_STATUS DCD_GetObjects(IN struct DCD_MANAGER *hDcdMgr, IN char *pszCoffPath, #endif if (DSP_SUCCEEDED(status)) { /* Compress DSP buffer to conform to PC format. */ - GT_0trace(curTrace, GT_4CLASS, - "Successfully read section !!\n"); if (strstr(pszCoffPath, "iva") == NULL) { CompressBuf(pszCoffBuf, ulLen, DSPWORDSIZE); } else { @@ -637,14 +631,8 @@ DSP_STATUS DCD_GetObjects(IN struct DCD_MANAGER *hDcdMgr, IN char *pszCoffPath, * 2) Unregister found DCD object (when handle == NULL) * 3) Add overlay node. */ - GT_1trace(curTrace, GT_4CLASS, "Registering objtype " - "%d \n", cObjectType); status = registerFxn(&dspUuid, cObjectType, handle); - if (DSP_SUCCEEDED(status)) { - GT_1trace(curTrace, GT_5CLASS, - "DCD_GetObjects: status 0x%x\n", - status); - } else { + if (DSP_FAILED(status)) { GT_0trace(curTrace, GT_6CLASS, "DCD_GetObjects: " "registration() failed\n"); diff --git a/drivers/dsp/bridge/rmgr/disp.c b/drivers/dsp/bridge/rmgr/disp.c index ac2af3c..4d7a2da 100644 --- a/drivers/dsp/bridge/rmgr/disp.c +++ b/drivers/dsp/bridge/rmgr/disp.c @@ -144,8 +144,7 @@ DSP_STATUS DISP_Create(OUT struct DISP_OBJECT **phDispObject, goto func_cont; status = DEV_GetDevType(hDevObject, &devType); - GT_1trace(DISP_DebugMask, GT_6CLASS, "DISP_Create: Creating DISP for " - "device = 0x%x\n", devType); + if (DSP_FAILED(status)) goto func_cont; @@ -330,9 +329,6 @@ DSP_STATUS DISP_NodeCreate(struct DISP_OBJECT *hDisp, struct NODE_OBJECT *hNode, status = DEV_GetDevType(hDisp->hDevObject, &devType); - GT_1trace(DISP_DebugMask, GT_6CLASS, "DISP_Create: Creating DISP " - "for device = 0x%x\n", devType); - if (DSP_FAILED(status)) goto func_end; diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c index d3c5df8..dbe1581 100644 --- a/drivers/dsp/bridge/rmgr/drv.c +++ b/drivers/dsp/bridge/rmgr/drv.c @@ -148,25 +148,14 @@ static DSP_STATUS DRV_ProcFreeNodeRes(HANDLE hPCtxt) pNodeList = pNodeList->next; if (pNodeRes->nodeAllocated) { nState = NODE_GetState(pNodeRes->hNode) ; - GT_1trace(curTrace, GT_5CLASS, - "DRV_ProcFreeNodeRes: Node state %x\n", nState); if (nState <= NODE_DELETING) { if ((nState == NODE_RUNNING) || (nState == NODE_PAUSED) || (nState == NODE_TERMINATING)) { - GT_1trace(curTrace, GT_5CLASS, - "Calling Node_Terminate for Node:" - " 0x%x\n", pNodeRes->hNode); status = NODE_Terminate (pNodeRes->hNode, &status); - GT_1trace(curTrace, GT_5CLASS, - "Calling Node_Delete for Node:" - " 0x%x\n", pNodeRes->hNode); status = NODE_Delete(pNodeRes->hNode, pCtxt); - GT_1trace(curTrace, GT_5CLASS, - "the status after the NodeDelete %x\n", - status); } else if ((nState == NODE_ALLOCATED) || (nState == NODE_CREATED)) status = NODE_Delete(pNodeRes->hNode, @@ -188,14 +177,11 @@ DSP_STATUS DRV_InsertDMMResElement(HANDLE hDMMRes, HANDLE hPCtxt) *pDMMRes = (struct DMM_RES_OBJECT *) MEM_Calloc(1 * sizeof(struct DMM_RES_OBJECT), MEM_PAGED); - if (*pDMMRes == NULL) { - GT_0trace(curTrace, GT_5CLASS, "DRV_InsertDMMResElement: 2"); + if (*pDMMRes == NULL) status = DSP_EHANDLE; - } + if (DSP_SUCCEEDED(status)) { if (pCtxt->pDMMList != NULL) { - GT_0trace(curTrace, GT_5CLASS, - "DRV_InsertDMMResElement: 3"); pTempDMMRes = pCtxt->pDMMList; while (pTempDMMRes->next != NULL) pTempDMMRes = pTempDMMRes->next; @@ -203,8 +189,6 @@ DSP_STATUS DRV_InsertDMMResElement(HANDLE hDMMRes, HANDLE hPCtxt) pTempDMMRes->next = *pDMMRes; } else { pCtxt->pDMMList = *pDMMRes; - GT_0trace(curTrace, GT_5CLASS, - "DRV_InsertDMMResElement: 4"); } } @@ -575,9 +559,6 @@ DSP_STATUS DRV_Create(OUT struct DRV_OBJECT **phDRVObject) if (DSP_SUCCEEDED(status)) status = CFG_SetObject((u32) pDRVObject, REG_DRV_OBJECT); if (DSP_SUCCEEDED(status)) { - GT_1trace(curTrace, GT_1CLASS, - "DRV Obj Created pDrvObject 0x%x\n ", - pDRVObject); *phDRVObject = pDRVObject; } else { kfree(pDRVObject->devList); @@ -931,13 +912,10 @@ DSP_STATUS DRV_ReleaseResources(u32 dwContext, struct DRV_OBJECT *hDrvObject) struct DRV_EXT *pszdevNode; if (!(strcmp((char *)((struct DRV_EXT *)dwContext)->szString, - "TIOMAP1510"))) { - GT_0trace(curTrace, GT_1CLASS, - " Releasing DSP-Bridge resources \n"); + "TIOMAP1510"))) status = RequestBridgeResources(dwContext, DRV_RELEASE); - } else { + else GT_0trace(curTrace, GT_1CLASS, " Unknown device\n"); - } if (DSP_FAILED(status)) GT_0trace(curTrace, GT_1CLASS, @@ -998,9 +976,6 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest) status = CFG_E_RESOURCENOTAVAIL; GT_0trace(curTrace, GT_1CLASS, "REG_GetValue Failed \n"); - } else { - GT_0trace(curTrace, GT_1CLASS, - "REG_GetValue Succeeded \n"); } dwBuffSize = sizeof(shm_size); @@ -1115,11 +1090,7 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest) dwBuffSize = sizeof(struct CFG_HOSTRES); status = REG_SetValue(CURRENTCONFIG, (u8 *)pResources, sizeof(struct CFG_HOSTRES)); - if (DSP_SUCCEEDED(status)) { - GT_0trace(curTrace, GT_1CLASS, - " Successfully set the registry " - "value for CURRENTCONFIG\n"); - } else { + if (DSP_FAILED(status)) { GT_0trace(curTrace, GT_7CLASS, " Failed to set the registry " "value for CURRENTCONFIG\n"); @@ -1235,11 +1206,7 @@ static DSP_STATUS RequestBridgeResourcesDSP(u32 dwContext, s32 bRequest) dwBuffSize = sizeof(struct CFG_HOSTRES); status = REG_SetValue(CURRENTCONFIG, (u8 *)pResources, sizeof(struct CFG_HOSTRES)); - if (DSP_SUCCEEDED(status)) { - GT_0trace(curTrace, GT_1CLASS, - " Successfully set the registry" - " value for CURRENTCONFIG\n"); - } else { + if (DSP_FAILED(status)) { GT_0trace(curTrace, GT_7CLASS, " Failed to set the registry value" " for CURRENTCONFIG\n"); diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c index 4a909a9..8f9e626 100644 --- a/drivers/dsp/bridge/rmgr/drv_interface.c +++ b/drivers/dsp/bridge/rmgr/drv_interface.c @@ -331,17 +331,11 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev) pdata->mpu_speed[i] = vdd1_rate_table_bridge[i].rate; clk_handle = clk_get(NULL, "iva2_ck"); - if (!clk_handle) { + if (!clk_handle) GT_0trace(driverTrace, GT_7CLASS, "clk_get failed to get iva2_ck \n"); - } else { - GT_0trace(driverTrace, GT_7CLASS, - "clk_get PASS to get iva2_ck \n"); - } - if (!clk_notifier_register(clk_handle, &iva_clk_notifier)) { - GT_0trace(driverTrace, GT_7CLASS, - "clk_notifier_register PASS for iva2_ck \n"); - } else { + + if (clk_notifier_register(clk_handle, &iva_clk_notifier)) { GT_0trace(driverTrace, GT_7CLASS, "clk_notifier_register FAIL for iva2_ck \n"); } @@ -380,10 +374,7 @@ static int __devexit omap34xx_bridge_remove(struct platform_device *pdev) goto func_cont; #ifdef CONFIG_BRIDGE_DVFS - if (!clk_notifier_unregister(clk_handle, &iva_clk_notifier)) { - GT_0trace(driverTrace, GT_7CLASS, - "clk_notifier_unregister PASS for iva2_ck \n"); - } else { + if (clk_notifier_unregister(clk_handle, &iva_clk_notifier)) { GT_0trace(driverTrace, GT_7CLASS, "clk_notifier_unregister FAILED for iva2_ck \n"); } diff --git a/drivers/dsp/bridge/rmgr/dspdrv.c b/drivers/dsp/bridge/rmgr/dspdrv.c index 522da73..dae61e2 100644 --- a/drivers/dsp/bridge/rmgr/dspdrv.c +++ b/drivers/dsp/bridge/rmgr/dspdrv.c @@ -71,7 +71,6 @@ u32 DSP_Init(OUT u32 *initStatus) WCD_Exit(); goto func_cont; } /* End DRV_Create */ - GT_0trace(curTrace, GT_5CLASS, "DSP_Init:DRV Created \r\n"); /* Request Resources */ status = DRV_RequestResources((u32)&devNode, &deviceNodeString); @@ -79,12 +78,7 @@ u32 DSP_Init(OUT u32 *initStatus) /* Attempt to Start the Device */ status = DEV_StartDevice((struct CFG_DEVNODE *) deviceNodeString); - if (DSP_SUCCEEDED(status)) { - /* Retreive the DevObject from the Registry */ - GT_1trace(curTrace, GT_1CLASS, - "DSP_Init Succeeded for Device1 value: %x\n", - deviceNodeString); - } else { + if (DSP_FAILED(status)) { GT_0trace(curTrace, GT_7CLASS, "DSP_Init:DEV_StartDevice Failed\n"); (void)DRV_ReleaseResources @@ -123,7 +117,6 @@ func_cont: * correct one. We should not propagate that error * into the device loader. */ (void)WCD_InitComplete2(); - GT_0trace(curTrace, GT_1CLASS, "DSP_Init Succeeded\n"); } else { GT_0trace(curTrace, GT_7CLASS, "DSP_Init Failed\n"); } /* End WCD_InitComplete2 */ diff --git a/drivers/dsp/bridge/rmgr/mgr.c b/drivers/dsp/bridge/rmgr/mgr.c index 1f2fa48..d7118da 100644 --- a/drivers/dsp/bridge/rmgr/mgr.c +++ b/drivers/dsp/bridge/rmgr/mgr.c @@ -79,8 +79,6 @@ DSP_STATUS MGR_Create(OUT struct MGR_OBJECT **phMgrObject, REG_MGR_OBJECT); if (DSP_SUCCEEDED(status)) { *phMgrObject = pMgrObject; - GT_0trace(MGR_DebugMask, GT_1CLASS, - "MGR_Create:MGR Created\r\n"); } else { GT_0trace(MGR_DebugMask, GT_7CLASS, "MGR_Create:CFG_SetObject " diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c index d974cda..78770fc 100644 --- a/drivers/dsp/bridge/rmgr/node.c +++ b/drivers/dsp/bridge/rmgr/node.c @@ -477,17 +477,12 @@ DSP_STATUS NODE_Allocate(struct PROC_OBJECT *hProcessor, pNode->createArgs.asa.taskArgs.uHeapSize, (void *)pNode->createArgs.asa.taskArgs.uDSPHeapResAddr, (void **)&pMappedAddr, mapAttrs, pr_ctxt); - if (DSP_FAILED(status)) { + if (DSP_FAILED(status)) GT_1trace(NODE_debugMask, GT_5CLASS, "NODE_Allocate: Failed to map memory" " for Heap: 0x%x\n", status); - } else { - pNode->createArgs.asa.taskArgs.uDSPHeapAddr = - (u32) pMappedAddr; - GT_1trace(NODE_debugMask, GT_5CLASS, - "NODE_Allocate:DSPProcessor_Map" - " successful: 0x%x\n", status); - } + else + pNode->createArgs.asa.taskArgs.uDSPHeapAddr = (u32)pMappedAddr; func_cont: (void)SYNC_LeaveCS(hNodeMgr->hSync); @@ -1240,15 +1235,8 @@ DSP_STATUS NODE_Create(struct NODE_OBJECT *hNode) /* If node's create function is not loaded, load it */ /* Boost the OPP level to max level that DSP can be requested */ #if defined(CONFIG_BRIDGE_DVFS) && !defined(CONFIG_CPU_FREQ) - if (pdata->cpu_set_freq) { + if (pdata->cpu_set_freq) (*pdata->cpu_set_freq)(pdata->mpu_speed[VDD1_OPP3]); - - if (pdata->dsp_get_opp) { - GT_1trace(NODE_debugMask, GT_4CLASS, "opp level" - "after setting to VDD1_OPP3 is %d\n", - (*pdata->dsp_get_opp)()); - } - } #endif status = hNodeMgr->nldrFxns.pfnLoad(hNode->hNldrNode, NLDR_CREATE); @@ -1266,15 +1254,8 @@ DSP_STATUS NODE_Create(struct NODE_OBJECT *hNode) } /* Request the lowest OPP level*/ #if defined(CONFIG_BRIDGE_DVFS) && !defined(CONFIG_CPU_FREQ) - if (pdata->cpu_set_freq) { + if (pdata->cpu_set_freq) (*pdata->cpu_set_freq)(pdata->mpu_speed[VDD1_OPP1]); - - if (pdata->dsp_get_opp) { - GT_1trace(NODE_debugMask, GT_4CLASS, "opp level" - "after setting to VDD1_OPP1 is %d\n", - (*pdata->dsp_get_opp)()); - } - } #endif /* Get address of iAlg functions, if socket node */ if (DSP_SUCCEEDED(status)) { @@ -1445,11 +1426,9 @@ DSP_STATUS NODE_CreateMgr(OUT struct NODE_MGR **phNodeMgr, } /* Get loader functions and create loader */ - if (DSP_SUCCEEDED(status)) { - GT_0trace(NODE_debugMask, GT_1CLASS, - "NODE_CreateMgr: using dynamic loader\n"); + if (DSP_SUCCEEDED(status)) pNodeMgr->nldrFxns = nldrFxns; /* Dynamic loader functions */ - } + if (DSP_SUCCEEDED(status)) { nldrAttrs.pfnOvly = Ovly; nldrAttrs.pfnWrite = Write; @@ -1579,9 +1558,6 @@ func_cont1: if (DSP_SUCCEEDED(status)) { status = PROC_GetState(hProcessor, &procStatus, sizeof(struct DSP_PROCESSORSTATE)); - GT_1trace(NODE_debugMask, GT_4CLASS, - "NODE_Delete: proc Status " - "0x%x\n", procStatus.iState); if (procStatus.iState != PROC_ERROR) { status = DISP_NodeDelete(hDisp, hNode, hNodeMgr->ulFxnAddrs[RMSDELETENODE], @@ -1624,13 +1600,10 @@ func_cont1: hNodeMgr->uNumCreated--; /* Free host-side resources allocated by NODE_Create() * DeleteNode() fails if SM buffers not freed by client! */ - if (DRV_GetNodeResElement(hNode, &nodeRes, pr_ctxt) != DSP_ENOTFOUND) { - GT_0trace(NODE_debugMask, GT_5CLASS, "\nNODE_Delete12:\n"); + if (DRV_GetNodeResElement(hNode, &nodeRes, pr_ctxt) != DSP_ENOTFOUND) DRV_ProcNodeUpdateStatus(nodeRes, false); - } DeleteNode(hNode, pr_ctxt); - GT_0trace(NODE_debugMask, GT_5CLASS, "\nNODE_Delete2:\n "); DRV_RemoveNodeResElement(nodeRes, pr_ctxt); /* Exit critical section */ (void)SYNC_LeaveCS(hNodeMgr->hSync); @@ -2518,9 +2491,6 @@ DSP_STATUS NODE_Terminate(struct NODE_OBJECT *hNode, OUT DSP_STATUS *pStatus) * Send exit message. Do not change state to NODE_DONE * here. That will be done in callback. */ - GT_1trace(NODE_debugMask, GT_5CLASS, - "NODE_Terminate: env = 0x%x\n", hNode->nodeEnv); - status = PROC_GetState(pNode->hProcessor, &procStatus, sizeof(struct DSP_PROCESSORSTATE)); if (DSP_FAILED(status)) @@ -2685,26 +2655,18 @@ static void DeleteNode(struct NODE_OBJECT *hNode, status = PROC_UnMap(hNode->hProcessor, (void *)taskArgs.uDSPHeapAddr, pr_ctxt); - if (DSP_SUCCEEDED(status)) { - GT_0trace(NODE_debugMask, GT_5CLASS, - "DSPProcessor_UnMap succeeded.\n"); - } else { + if (DSP_FAILED(status)) GT_1trace(NODE_debugMask, GT_5CLASS, "DSPProcessor_UnMap failed." " Status = 0x%x\n", (u32)status); - } + status = PROC_UnReserveMemory(hNode->hProcessor, (void *)taskArgs.uDSPHeapResAddr); - if (DSP_SUCCEEDED(status)) { - GT_0trace(NODE_debugMask, GT_5CLASS, - "DSPProcessor_UnReserveMemory " - "succeeded.\n"); - } else { + if (DSP_FAILED(status)) GT_1trace(NODE_debugMask, GT_5CLASS, "DSPProcessor_UnReserveMemory " "failed. Status = 0x%x\n", (u32)status); - } #ifdef DSP_DMM_DEBUG status = DMM_GetHandle(pProcObject, &hDmmMgr); if (DSP_SUCCEEDED(status)) diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c index 7c0264e..f451244 100644 --- a/drivers/dsp/bridge/rmgr/proc.c +++ b/drivers/dsp/bridge/rmgr/proc.c @@ -226,12 +226,8 @@ PROC_Attach(u32 uProcessor, OPTIONAL CONST struct DSP_PROCESSORATTRIN *pAttrIn, (u32)pProcObject, &pProcObject->bIsAlreadyAttached); if (DSP_SUCCEEDED(status)) { - if (pProcObject->bIsAlreadyAttached) { + if (pProcObject->bIsAlreadyAttached) status = DSP_SALREADYATTACHED; - GT_0trace(PROC_DebugMask, GT_1CLASS, - "PROC_Attach: Processor " - "Already Attached!\n"); - } } else { if (pProcObject->hNtfy) NTFY_Delete(pProcObject->hNtfy); @@ -246,9 +242,6 @@ PROC_Attach(u32 uProcessor, OPTIONAL CONST struct DSP_PROCESSORATTRIN *pAttrIn, pr_ctxt->hProcessor = *phProcessor; (void)PROC_NotifyClients(pProcObject, DSP_PROCESSORATTACH); - GT_0trace(PROC_DebugMask, GT_1CLASS, - "PROC_Attach: Processor " - "Attach Success!\n"); } } else { /* Don't leak memory if DSP_FAILED */ @@ -333,7 +326,6 @@ DSP_STATUS PROC_AutoStart(struct CFG_DEVNODE *hDevNode, status = DSP_EMEMORY; goto func_end; } - GT_0trace(PROC_DebugMask, GT_1CLASS, "NTFY Created \n"); pProcObject->hDevObject = hDevObject; pProcObject->hMgrObject = hMgrObject; hProcObject = pProcObject; @@ -382,11 +374,7 @@ DSP_STATUS PROC_AutoStart(struct CFG_DEVNODE *hDevNode, status = PROC_Load(hProcObject, 1, (CONST char **)argv, NULL); if (DSP_SUCCEEDED(status)) { status = PROC_Start(hProcObject); - if (DSP_SUCCEEDED(status)) { - GT_0trace(PROC_DebugMask, GT_1CLASS, - "PROC_AutoStart: Processor started " - "running\n"); - } else { + if (DSP_FAILED(status)) { GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_AutoStart: DSP_FAILED To " "Start \n"); @@ -963,11 +951,6 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc, "PROC_Load: Invalid Processor Handle..\n"); goto func_end; } - if (pProcObject->bIsAlreadyAttached) { - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Load GPP " - "Client is already attached status \n"); - } if (DSP_FAILED(DEV_GetCodMgr(pProcObject->hDevObject, &hCodMgr))) { status = DSP_EFAIL; GT_1trace(PROC_DebugMask, GT_7CLASS, "PROC_Load: DSP_FAILED in " @@ -1464,8 +1447,6 @@ DSP_STATUS PROC_Start(DSP_HPROCESSOR hProcessor) PROC_NotifyClients(pProcObject, DSP_PROCESSORSTATECHANGE); } - GT_0trace(PROC_DebugMask, GT_1CLASS, "PROC_Start: Processor " - "Started and running \n"); } else { /* Failed to Create Node Manager and DISP Object * Stop the Processor from running. Put it in STOPPED State */ @@ -1553,11 +1534,8 @@ DSP_STATUS PROC_Stop(DSP_HPROCESSOR hProcessor) #ifdef CONFIG_BRIDGE_DEBUG if (DSP_SUCCEEDED((*pProcObject->pIntfFxns-> pfnBrdStatus)(pProcObject->hWmdContext, - &uBrdState))) { - GT_0trace(PROC_DebugMask, GT_1CLASS, - "PROC_Monitor:Processor Stopped \n"); + &uBrdState))) DBC_Assert(uBrdState == BRD_STOPPED); - } #endif } else { GT_0trace(PROC_DebugMask, GT_7CLASS, @@ -1620,9 +1598,6 @@ DSP_STATUS PROC_UnMap(DSP_HPROCESSOR hProcessor, void *pMapAddr, (pProcObject->hWmdContext, vaAlign, sizeAlign); } (void)SYNC_LeaveCS(hProcLock); - GT_1trace(PROC_DebugMask, GT_ENTER, - "PROC_UnMap DRV_GetDMMResElement " - "pMapAddr:[0x%x]", pMapAddr); if (DSP_FAILED(status)) goto func_end; @@ -1716,13 +1691,10 @@ static DSP_STATUS PROC_Monitor(struct PROC_OBJECT *hProcObject) status = DSP_SOK; #ifdef CONFIG_BRIDGE_DEBUG if (DSP_SUCCEEDED((*pProcObject->pIntfFxns->pfnBrdStatus) - (pProcObject->hWmdContext, &uBrdState))) { - GT_0trace(PROC_DebugMask, GT_1CLASS, - "PROC_Monitor:Processor in " - "Monitor State\n"); + (pProcObject->hWmdContext, &uBrdState))) DBC_Assert(uBrdState == BRD_IDLE); - } #endif + } else { /* Monitor Failure */ GT_0trace(PROC_DebugMask, GT_7CLASS, @@ -1804,8 +1776,6 @@ DSP_STATUS PROC_NotifyClients(DSP_HPROCESSOR hProc, u32 uEvents) } NTFY_Notify(pProcObject->hNtfy, uEvents); - GT_0trace(PROC_DebugMask, GT_1CLASS, - "PROC_NotifyClients :Signaled. \n"); func_end: return status; } @@ -1833,8 +1803,6 @@ DSP_STATUS PROC_NotifyAllClients(DSP_HPROCESSOR hProc, u32 uEvents) DEV_NotifyClients(pProcObject->hDevObject, uEvents); - GT_0trace(PROC_DebugMask, GT_1CLASS, - "PROC_NotifyAllClients :Signaled. \n"); func_end: return status; } -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 06/18] DSPBRIDGE: Remove debug statements for success in wmd 2010-02-16 8:42 ` [PATCH 05/18] DSPBRIDGE: Remove debug statements for success in rmgr Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 07/18] DSPBRIDGE: Remove debug statements for success in pmgr Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna This patch removes debug statements used to print a successful status or printed during normal execution, as they just polute the logs if trying to look for a failure. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/wmd/chnl_sm.c | 4 -- drivers/dsp/bridge/wmd/io_sm.c | 46 ++----------------- drivers/dsp/bridge/wmd/mmu_fault.c | 5 -- drivers/dsp/bridge/wmd/tiomap3430.c | 74 +++++------------------------- drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 27 +---------- drivers/dsp/bridge/wmd/tiomap_io.c | 22 +-------- drivers/dsp/bridge/wmd/ue_deh.c | 7 --- 7 files changed, 23 insertions(+), 162 deletions(-) diff --git a/drivers/dsp/bridge/wmd/chnl_sm.c b/drivers/dsp/bridge/wmd/chnl_sm.c index 11e3930..08bd09d 100644 --- a/drivers/dsp/bridge/wmd/chnl_sm.c +++ b/drivers/dsp/bridge/wmd/chnl_sm.c @@ -681,10 +681,6 @@ DSP_STATUS WMD_CHNL_GetIOC(struct CHNL_OBJECT *hChnl, u32 dwTimeOut, status = copy_to_user(ioc.pBuf, pHostSysBuf, ioc.cBytes); if (status) { if (current->flags & PF_EXITING) { - DBG_Trace(DBG_LEVEL7, - "\n2current->flags == PF_EXITING, " - " current->flags;0x%x\n", - current->flags); status = 0; } else { DBG_Trace(DBG_LEVEL7, diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c index 046300b..55ec6ef 100644 --- a/drivers/dsp/bridge/wmd/io_sm.c +++ b/drivers/dsp/bridge/wmd/io_sm.c @@ -276,10 +276,7 @@ DSP_STATUS WMD_IO_Create(OUT struct IO_MGR **phIOMgr, HW_MBOX_initSettings(hostRes.dwMboxBase); /* Plug the channel ISR */ if ((request_irq(INT_MAIL_MPU_IRQ, IO_ISR, 0, - "DspBridge\tmailbox", (void *)pIOMgr)) == 0) - DBG_Trace(DBG_LEVEL1, "ISR_IRQ Object 0x%x \n", - pIOMgr); - else + "DspBridge\tmailbox", (void *)pIOMgr)) != 0) status = CHNL_E_ISR; } } else { @@ -320,7 +317,6 @@ DSP_STATUS WMD_IO_Destroy(struct IO_MGR *hIOMgr) /* Free IO DPC object */ tasklet_kill(&hIOMgr->dpc_tasklet); - DBG_Trace(GT_2CLASS, "DPC_Destroy: SUCCESS\n"); #ifndef DSP_TRACEBUF_DISABLED kfree(hIOMgr->pMsg); @@ -452,12 +448,9 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr) if (DSP_SUCCEEDED(status)) { #ifndef DSP_TRACEBUF_DISABLED status = COD_GetSymValue(hCodMan, DSP_TRACESEC_END, &ulShm0End); - DBG_Trace(DBG_LEVEL7, "_BRIDGE_TRACE_END value = %x \n", - ulShm0End); #else status = COD_GetSymValue(hCodMan, SHM0_SHARED_END_SYM, &ulShm0End); - DBG_Trace(DBG_LEVEL7, "_SHM0_END = %x \n", ulShm0End); #endif if (DSP_FAILED(status)) status = CHNL_E_NOMEMMAP; @@ -713,8 +706,7 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr) */ hIOMgr->extProcInfo.tyTlb[0].ulGppPhys = (ulGppVa + ulSeg1Size + ulPadSize); - DBG_Trace(DBG_LEVEL1, "*********extProcInfo *********%x \n", - hIOMgr->extProcInfo.tyTlb[0].ulGppPhys); + /* * Need SHM Phys addr. IO supports only one DSP for now: * uNumProcs = 1. @@ -742,8 +734,6 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr) if (DSP_FAILED(status)) goto func_end; ulShmBase = hIOMgr->extProcInfo.tyTlb[0].ulGppPhys; - DBG_Trace(DBG_LEVEL1, "extProcInfo.tyTlb[0].ulGppPhys %x \n ", - hIOMgr->extProcInfo.tyTlb[0].ulGppPhys); ulShmBase += ulShmBaseOffset; ulShmBase = (u32)MEM_LinearAddress((void *)ulShmBase, ulMemLength); @@ -760,10 +750,7 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr) hIOMgr->pOutput = hIOMgr->pInput + (ulShmLength - sizeof(struct SHM)) / 2; hIOMgr->uSMBufSize = hIOMgr->pOutput - hIOMgr->pInput; - DBG_Trace(DBG_LEVEL3, "hIOMgr: pInput %p pOutput %p ulShmLength %x\n", - hIOMgr->pInput, hIOMgr->pOutput, ulShmLength); - DBG_Trace(DBG_LEVEL3, "pSharedMem %p uSMBufSize %x sizeof(SHM) %x\n", - hIOMgr->pSharedMem, hIOMgr->uSMBufSize, sizeof(struct SHM)); + /* Set up Shared memory addresses for messaging. */ hIOMgr->pMsgInputCtrl = (struct MSG *)((u8 *)hIOMgr->pSharedMem + ulShmLength); @@ -822,7 +809,6 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr) if (!hIOMgr->pMsg) status = DSP_EMEMORY; - DBG_Trace(DBG_LEVEL1, "** hIOMgr->pMsg: 0x%x\n", hIOMgr->pMsg); hIOMgr->ulDspVa = ulDspVa; hIOMgr->ulGppVa = (ulGppVa + ulSeg1Size + ulPadSize); @@ -917,8 +903,7 @@ static void IO_DispatchPM(struct work_struct *work) while (pIOMgr->iQuePowerHead != pIOMgr->iQuePowerTail) { pArg[0] = *(u32 *)&(pIOMgr->dQuePowerMbxVal[pIOMgr-> iQuePowerTail]); - DBG_Trace(DBG_LEVEL7, "IO_DispatchPM - pArg[0] - 0x%x: \n", - pArg[0]); + /* Send the command to the WMD clk/pwr manager to handle */ if (pArg[0] == MBX_PM_HIBERNATE_EN) { DBG_Trace(DBG_LEVEL7, "IO_DispatchPM : Hibernate " @@ -1035,7 +1020,6 @@ irqreturn_t IO_ISR(int irq, IN void *pRefData) /* Call WMD's CHNLSM_ISR() to see if interrupt is ours, and process. */ if (IO_CALLISR(hIOMgr->hWmdContext, &fSchedDPC, &hIOMgr->wIntrVal)) { - DBG_Trace(DBG_LEVEL3, "IO_ISR %x\n", hIOMgr->wIntrVal); if (hIOMgr->wIntrVal & MBX_PM_CLASS) { hIOMgr->dQuePowerMbxVal[hIOMgr->iQuePowerHead] = hIOMgr->wIntrVal; @@ -1046,7 +1030,6 @@ irqreturn_t IO_ISR(int irq, IN void *pRefData) queue_work(bridge_workqueue, &hIOMgr->io_workq); } if (hIOMgr->wIntrVal == MBX_DEH_RESET) { - DBG_Trace(DBG_LEVEL6, "*** DSP RESET ***\n"); hIOMgr->wIntrVal = 0; } else if (fSchedDPC) { /* @@ -1228,9 +1211,7 @@ static void InputChnl(struct IO_MGR *pIOMgr, struct CHNL_OBJECT *pChnl, pChirp->cBytes = uBytes; pChirp->dwArg = dwArg; pChirp->status = CHNL_IOCSTATCOMPLETE; - DBG_Trace(DBG_LEVEL7, "Input Chnl:status= 0x%x " - "\n", *((RMS_WORD *)(pChirp-> - pHostSysBuf))); + if (uBytes == 0) { /* * This assertion fails if the DSP @@ -1252,8 +1233,6 @@ static void InputChnl(struct IO_MGR *pIOMgr, struct CHNL_OBJECT *pChnl, */ NTFY_Notify(pChnl->hNtfy, DSP_STREAMDONE); - DBG_Trace(DBG_LEVEL7, "Input Chnl NTFY " - "chnl = 0x%x\n", pChnl); } /* Tell DSP if no more I/O buffers available */ if (!pChnl->pIORequests) @@ -1660,8 +1639,6 @@ static DSP_STATUS registerSHMSegs(struct IO_MGR *hIOMgr, /* Get start and length of message part of shared memory */ status = COD_GetSymValue(hCodMan, SHM0_SHARED_RESERVED_BASE_SYM, &ulShm0_RsrvdStart); - DBG_Trace(DBG_LEVEL1, "***ulShm0_RsrvdStart 0x%x \n", - ulShm0_RsrvdStart); if (ulShm0_RsrvdStart == 0) { status = DSP_EFAIL; goto func_end; @@ -2027,9 +2004,6 @@ DSP_STATUS PrintDspTraceBuffer(struct WMD_DEV_CONTEXT *hWmdContext) if (DSP_SUCCEEDED(status)) { /* Look for SYS_PUTCBEG/SYS_PUTCEND */ status = COD_GetSymValue(hCodMgr, COD_TRACEBEG, &ulTraceBegin); - GT_1trace(dsp_trace_mask, GT_2CLASS, - "PrintDspTraceBuffer: ulTraceBegin Value 0x%x\n", - ulTraceBegin); if (DSP_FAILED(status)) GT_0trace(dsp_trace_mask, GT_2CLASS, "PrintDspTraceBuffer: Failed on " @@ -2037,9 +2011,6 @@ DSP_STATUS PrintDspTraceBuffer(struct WMD_DEV_CONTEXT *hWmdContext) } if (DSP_SUCCEEDED(status)) { status = COD_GetSymValue(hCodMgr, COD_TRACEEND, &ulTraceEnd); - GT_1trace(dsp_trace_mask, GT_2CLASS, - "PrintDspTraceBuffer: ulTraceEnd Value 0x%x\n", - ulTraceEnd); if (DSP_FAILED(status)) GT_0trace(dsp_trace_mask, GT_2CLASS, "PrintDspTraceBuffer: Failed on " @@ -2056,11 +2027,7 @@ DSP_STATUS PrintDspTraceBuffer(struct WMD_DEV_CONTEXT *hWmdContext) /* Make sure the data we request fits evenly */ ulNumBytes = (ulNumBytes / ulWordSize) * ulWordSize; - GT_1trace(dsp_trace_mask, GT_2CLASS, "PrintDspTraceBuffer: " - "ulNumBytes 0x%x\n", ulNumBytes); ulNumWords = ulNumBytes * ulWordSize; - GT_1trace(dsp_trace_mask, GT_2CLASS, "PrintDspTraceBuffer: " - "ulNumWords 0x%x\n", ulNumWords); status = DEV_GetIntfFxns(pDevObject, &pIntfFxns); } @@ -2079,9 +2046,6 @@ DSP_STATUS PrintDspTraceBuffer(struct WMD_DEV_CONTEXT *hWmdContext) if (DSP_SUCCEEDED(status)) { /* Pack and do newline conversion */ - GT_0trace(dsp_trace_mask, GT_2CLASS, - "PrintDspTraceBuffer: " - "before pack and unpack.\n"); PackTraceBuffer(pszBuf, ulNumBytes, ulNumWords); GT_1trace(dsp_trace_mask, GT_1CLASS, "DSP Trace Buffer:\n%s\n", pszBuf); diff --git a/drivers/dsp/bridge/wmd/mmu_fault.c b/drivers/dsp/bridge/wmd/mmu_fault.c index a3c8657..14cfd62 100644 --- a/drivers/dsp/bridge/wmd/mmu_fault.c +++ b/drivers/dsp/bridge/wmd/mmu_fault.c @@ -108,9 +108,6 @@ irqreturn_t MMU_FaultIsr(int irq, IN void *pRefData) HW_MMU_EventDisable(resources.dwDmmuBase, HW_MMU_TRANSLATION_FAULT); } else { - DBG_Trace(DBG_LEVEL7, - "***** MMU FAULT ***** faultcode 0x%x\n", - dmmuEventMask); HW_MMU_EventDisable(resources.dwDmmuBase, HW_MMU_ALL_INTERRUPTS); } @@ -141,8 +138,6 @@ static bool MMU_CheckIfFault(struct WMD_DEV_CONTEXT *pDevContext) hwStatus = HW_MMU_EventStatus(resources.dwDmmuBase, &dmmuEventMask); if (dmmuEventMask == HW_MMU_TRANSLATION_FAULT) { HW_MMU_FaultAddrRead(resources.dwDmmuBase, &faultAddr); - DBG_Trace(DBG_LEVEL1, "WMD_DEH_Notify: DSP_MMUFAULT, fault " - "address = 0x%x\n", faultAddr); retVal = true; } return retVal; diff --git a/drivers/dsp/bridge/wmd/tiomap3430.c b/drivers/dsp/bridge/wmd/tiomap3430.c index 3598c2b..ce8e619 100644 --- a/drivers/dsp/bridge/wmd/tiomap3430.c +++ b/drivers/dsp/bridge/wmd/tiomap3430.c @@ -342,7 +342,7 @@ static DSP_STATUS WMD_BRD_Monitor(struct WMD_DEV_CONTEXT *hDevContext) /* Disable Automatic transition */ HW_PWR_CLKCTRL_IVA2RegSet(resources.dwCmBase, HW_AUTOTRANS_DIS); } - DBG_Trace(DBG_LEVEL6, "WMD_BRD_Monitor - Middle ****** \n"); + GetHWRegs(resources.dwPrmBase, resources.dwCmBase); HW_RST_UnReset(resources.dwPrmBase, HW_RST2_IVA2); CLK_Enable(SERVICESCLK_iva2_ck); @@ -381,8 +381,6 @@ static DSP_STATUS WMD_BRD_Read(struct WMD_DEV_CONTEXT *hDevContext, pDevContext->dwInternalSize) { offset = dwDSPAddr - pDevContext->dwDSPStartAdd; } else { - DBG_Trace(DBG_LEVEL1, - "**** Reading From external memory **** \n "); status = ReadExtDspData(pDevContext, pbHostBuf, dwDSPAddr, ulNumBytes, ulMemType); return status; @@ -499,7 +497,7 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, udelay(100); HW_RST_UnReset(resources.dwPrmBase, HW_RST2_IVA2); udelay(100); - DBG_Trace(DBG_LEVEL6, "WMD_BRD_Start 0 ****** \n"); + GetHWRegs(resources.dwPrmBase, resources.dwCmBase); /* Disbale the DSP MMU */ HW_MMU_Disable(resources.dwDmmuBase); @@ -553,21 +551,16 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, /* Enable the BIOS clock */ (void)DEV_GetSymbol(pDevContext->hDevObject, BRIDGEINIT_BIOSGPTIMER, &ulBiosGpTimer); - DBG_Trace(DBG_LEVEL7, "BIOS GPTimer : 0x%x\n", ulBiosGpTimer); (void)DEV_GetSymbol(pDevContext->hDevObject, BRIDGEINIT_LOADMON_GPTIMER, &ulLoadMonitorTimer); - DBG_Trace(DBG_LEVEL7, "Load Monitor Timer : 0x%x\n", - ulLoadMonitorTimer); } if (DSP_SUCCEEDED(status)) { if (ulLoadMonitorTimer != 0xFFFF) { uClkCmd = (BPWR_DisableClock << MBX_PM_CLK_CMDSHIFT) | ulLoadMonitorTimer; - DBG_Trace(DBG_LEVEL7, - "encoded LoadMonitor cmd for Disable: 0x%x\n", - uClkCmd); + DSPPeripheralClkCtrl(pDevContext, &uClkCmd); extClkId = uClkCmd & MBX_PM_CLK_IDMASK; @@ -589,9 +582,7 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, } uClkCmd = (BPWR_EnableClock << MBX_PM_CLK_CMDSHIFT) | ulLoadMonitorTimer; - DBG_Trace(DBG_LEVEL7, - "encoded LoadMonitor cmd for Enable : 0x%x\n", - uClkCmd); + DSPPeripheralClkCtrl(pDevContext, &uClkCmd); } else { @@ -605,8 +596,7 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, if (ulBiosGpTimer != 0xFFFF) { uClkCmd = (BPWR_DisableClock << MBX_PM_CLK_CMDSHIFT) | ulBiosGpTimer; - DBG_Trace(DBG_LEVEL7, "encoded BIOS GPTimer cmd for" - "Disable: 0x%x\n", uClkCmd); + DSPPeripheralClkCtrl(pDevContext, &uClkCmd); extClkId = uClkCmd & MBX_PM_CLK_IDMASK; @@ -630,8 +620,7 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, uClkCmd = (BPWR_EnableClock << MBX_PM_CLK_CMDSHIFT) | ulBiosGpTimer; - DBG_Trace(DBG_LEVEL7, "encoded BIOS GPTimer cmd :" - "0x%x\n", uClkCmd); + DSPPeripheralClkCtrl(pDevContext, &uClkCmd); } else { @@ -650,8 +639,6 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, temp = (temp & 0xFFFFFFFE) | 0x1; *((REG_UWORD32 *) ((u32) (resources.dwCmBase) + 0x34)) = (u32) temp; - DBG_Trace(DBG_LEVEL5, "WMD_BRD_Start: _BRIDGE_DSP_FREQ Addr:" - "0x%x \n", ulDspClkAddr); if ((unsigned int *)ulDspClkAddr != NULL) { /* Get the clock rate */ status = CLK_GetRate(SERVICESCLK_iva2_ck, @@ -693,13 +680,6 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, * stale messages */ (void)CHNLSM_EnableInterrupt(pDevContext); - HW_RSTCTRL_RegGet(resources.dwPrmBase, HW_RST1_IVA2, &temp); - DBG_Trace(DBG_LEVEL7, "BRD_Start: RM_RSTCTRL_DSP = 0x%x \n", - temp); - HW_RSTST_RegGet(resources.dwPrmBase, HW_RST1_IVA2, &temp); - DBG_Trace(DBG_LEVEL7, "BRD_Start0: RM_RSTST_DSP = 0x%x \n", - temp); - /* Let DSP go */ DBG_Trace(DBG_LEVEL7, "Unreset, WMD_BRD_Start\n"); /* Enable DSP MMU Interrupts */ @@ -708,12 +688,6 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, /* release the RST1, DSP starts executing now .. */ HW_RST_UnReset(resources.dwPrmBase, HW_RST1_IVA2); - HW_RSTST_RegGet(resources.dwPrmBase, HW_RST1_IVA2, &temp); - DBG_Trace(DBG_LEVEL7, "BRD_Start: RM_RSTST_DSP = 0x%x \n", - temp); - HW_RSTCTRL_RegGet(resources.dwPrmBase, HW_RST1_IVA2, &temp); - DBG_Trace(DBG_LEVEL5, "WMD_BRD_Start: CM_RSTCTRL_DSP: 0x%x \n", - temp); DBG_Trace(DBG_LEVEL7, "Driver waiting for Sync @ 0x%x \n", dwSyncAddr); DBG_Trace(DBG_LEVEL7, "DSP c_int00 Address = 0x%x \n", @@ -732,8 +706,6 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, status = DEV_GetIOMgr(pDevContext->hDevObject, &hIOMgr); if (DSP_SUCCEEDED(status)) { IO_SHMsetting(hIOMgr, SHM_OPPINFO, NULL); - DBG_Trace(DBG_LEVEL7, - "WMD_BRD_Start: OPP information initialzed\n"); /* Write the synchronization bit to indicate the * completion of OPP table update to DSP */ @@ -742,7 +714,6 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, /* update board state */ pDevContext->dwBrdState = BRD_RUNNING; /* (void)CHNLSM_EnableInterrupt(pDevContext);*/ - DBG_Trace(DBG_LEVEL7, "Device Started \n "); } else { pDevContext->dwBrdState = BRD_UNKNOWN; DBG_Trace(DBG_LEVEL7, "Device not Started \n "); @@ -822,7 +793,7 @@ static DSP_STATUS WMD_BRD_Stop(struct WMD_DEV_CONTEXT *hDevContext) pDevContext->dwDspExtBaseAddr = 0; pDevContext->dwBrdState = BRD_STOPPED; /* update board state */ - DBG_Trace(DBG_LEVEL1, "Device Stopped \n "); + /* This is a good place to clear the MMU page tables as well */ if (pDevContext->pPtAttrs) { pPtAttrs = pDevContext->pPtAttrs; @@ -885,7 +856,7 @@ static DSP_STATUS WMD_BRD_Delete(struct WMD_DEV_CONTEXT *hDevContext) pDevContext->dwDspExtBaseAddr = 0; pDevContext->dwBrdState = BRD_STOPPED; /* update board state */ - DBG_Trace(DBG_LEVEL1, "Device Stopped \n "); + /* This is a good place to clear the MMU page tables as well */ if (pDevContext->pPtAttrs) { pPtAttrs = pDevContext->pPtAttrs; @@ -1087,8 +1058,6 @@ static DSP_STATUS WMD_DEV_Create(OUT struct WMD_DEV_CONTEXT **ppDevContext, } if (DSP_SUCCEEDED(status)) { /* Set the Clock Divisor for the DSP module */ - DBG_Trace(DBG_LEVEL7, "WMD_DEV_create:Reset mail box and " - "enable the clock \n"); status = CLK_Enable(SERVICESCLK_mailbox_ick); if (DSP_FAILED(status)) { DBG_Trace(DBG_LEVEL7, @@ -1107,7 +1076,6 @@ static DSP_STATUS WMD_DEV_Create(OUT struct WMD_DEV_CONTEXT **ppDevContext, pDevContext->dwBrdState = BRD_STOPPED; /* Return this ptr to our device state to the WCD for storage:*/ *ppDevContext = pDevContext; - DBG_Trace(DBG_ENTER, "Device Created \n"); } else { if (pPtAttrs != NULL) { if (pPtAttrs->hCSObj) @@ -1162,33 +1130,26 @@ static DSP_STATUS WMD_DEV_Ctrl(struct WMD_DEV_CONTEXT *pDevContext, u32 dwCmd, case WMDIOCTL_EMERGENCYSLEEP: /* Currently only DSP Idle is supported Need to update for * later releases */ - DBG_Trace(DBG_LEVEL5, "WMDIOCTL_DEEPSLEEP\n"); status = SleepDSP(pDevContext, PWR_DEEPSLEEP, pArgs); break; case WMDIOCTL_WAKEUP: - DBG_Trace(DBG_LEVEL5, "WMDIOCTL_WAKEUP\n"); status = WakeDSP(pDevContext, pArgs); break; case WMDIOCTL_CLK_CTRL: - DBG_Trace(DBG_LEVEL5, "WMDIOCTL_CLK_CTRL\n"); status = DSP_SOK; /* Looking For Baseport Fix for Clocks */ status = DSPPeripheralClkCtrl(pDevContext, pArgs); break; case WMDIOCTL_PWR_HIBERNATE: - DBG_Trace(DBG_LEVEL5, "WMDIOCTL_PWR_HIBERNATE\n"); status = handle_hibernation_fromDSP(pDevContext); break; case WMDIOCTL_PRESCALE_NOTIFY: - DBG_Trace(DBG_LEVEL5, "WMDIOCTL_PRESCALE_NOTIFY\n"); status = PreScale_DSP(pDevContext, pArgs); break; case WMDIOCTL_POSTSCALE_NOTIFY: - DBG_Trace(DBG_LEVEL5, "WMDIOCTL_POSTSCALE_NOTIFY\n"); status = PostScale_DSP(pDevContext, pArgs); break; case WMDIOCTL_CONSTRAINT_REQUEST: - DBG_Trace(DBG_LEVEL5, "WMDIOCTL_CONSTRAINT_REQUEST\n"); status = handle_constraints_set(pDevContext, pArgs); break; default: @@ -1433,8 +1394,7 @@ static DSP_STATUS WMD_BRD_MemMap(struct WMD_DEV_CONTEXT *hDevContext, if (vma->vm_flags & VM_IO) { numUsrPgs = ulNumBytes / PG_SIZE_4K; mpuAddr = ulMpuAddr; - DBG_Trace(DBG_LEVEL4, "WMD_BRD_MemMap:numOfActualTabEntries=%d," - "ulNumBytes= %d\n", numUsrPgs, ulNumBytes); + /* Get the physical addresses for user buffer */ for (pgI = 0; pgI < numUsrPgs; pgI++) { pa = user_va2pa(mm, mpuAddr); @@ -1601,9 +1561,7 @@ static DSP_STATUS WMD_BRD_MemUnMap(struct WMD_DEV_CONTEXT *hDevContext, if (remBytes < (pteCount * PG_SIZE_4K)) pteCount = remBytes / PG_SIZE_4K; remBytesL2 = pteCount * PG_SIZE_4K; - DBG_Trace(DBG_LEVEL1, "WMD_BRD_MemUnMap L2BasePa %x, " - "L2BaseVa %x pteAddrL2 %x, remBytesL2 %x\n", - L2BasePa, L2BaseVa, pteAddrL2, remBytesL2); + /* * Unmap the VA space on this L2 PT. A quicker way * would be to clear pteCount entries starting from @@ -1676,10 +1634,7 @@ static DSP_STATUS WMD_BRD_MemUnMap(struct WMD_DEV_CONTEXT *hDevContext, remBytes -= pteCount * PG_SIZE_4K; } else status = DSP_EFAIL; - DBG_Trace(DBG_LEVEL1, "WMD_BRD_MemUnMap L2PageNum %x, " - "numEntries %x, pteCount %x, status: 0x%x\n", - L2PageNum, pt->pgInfo[L2PageNum].numEntries, - pteCount, status); + SYNC_LeaveCS(pt->hCSObj); continue; skip_coarse_page: @@ -1787,12 +1742,10 @@ static DSP_STATUS PteUpdate(struct WMD_DEV_CONTEXT *hDevContext, u32 pa, /* To find the max. page size with which both PA & VA are * aligned */ allBits = paCurr | vaCurr; - DBG_Trace(DBG_LEVEL1, "allBits %x, paCurr %x, vaCurr %x, " - "numBytes %x ", allBits, paCurr, vaCurr, numBytes); + for (i = 0; i < 4; i++) { if ((numBytes >= pgSize[i]) && ((allBits & (pgSize[i] - 1)) == 0)) { - DBG_Trace(DBG_LEVEL1, "pgSize %x\n", pgSize[i]); status = PteSet(pDevContext->pPtAttrs, paCurr, vaCurr, pgSize[i], mapAttrs); paCurr += pgSize[i]; @@ -1942,8 +1895,7 @@ static DSP_STATUS MemMapVmalloc(struct WMD_DEV_CONTEXT *pDevContext, while (++i < numPages) { pPage[0] = vmalloc_to_page((void *)(vaCurr + sizeCurr)); paNext = page_to_phys(pPage[0]); - DBG_Trace(DBG_LEVEL5, "Xlate Vmalloc VA=0x%x , " - "PA=0x%x \n", (vaCurr + sizeCurr), paNext); + if (paNext == (paCurr + sizeCurr)) sizeCurr += PAGE_SIZE; else diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c index 193844d..5acaf44 100644 --- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c +++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c @@ -124,12 +124,7 @@ DSP_STATUS handle_hibernation_fromDSP(struct WMD_DEV_CONTEXT *pDevContext) /* Save mailbox settings */ status = HW_MBOX_saveSettings(resources.dwMboxBase); - DBG_Trace(DBG_LEVEL6, "MailBoxSettings: SYSCONFIG = 0x%x\n", - mboxsetting.sysconfig); - DBG_Trace(DBG_LEVEL6, "MailBoxSettings: IRQENABLE0 = 0x%x\n", - mboxsetting.irqEnable0); - DBG_Trace(DBG_LEVEL6, "MailBoxSettings: IRQENABLE1 = 0x%x\n", - mboxsetting.irqEnable1); + /* Turn off DSP Peripheral clocks and DSP Load monitor timer */ status = DSP_PeripheralClocks_Disable(pDevContext, NULL); @@ -141,12 +136,7 @@ DSP_STATUS handle_hibernation_fromDSP(struct WMD_DEV_CONTEXT *pDevContext) if (DSP_FAILED(status)) return status; IO_SHMsetting(hIOMgr, SHM_GETOPP, &opplevel); - if (opplevel != VDD1_OPP1) { - DBG_Trace(DBG_LEVEL5, - " DSP requested OPP = %d, MPU" - " requesting low OPP %d instead\n", - opplevel, VDD1_OPP1); - } + /* * Set the OPP to low level before moving to OFF * mode @@ -255,9 +245,6 @@ DSP_STATUS SleepDSP(struct WMD_DEV_CONTEXT *pDevContext, IN u32 dwCmd, #endif /* CONFIG_BRIDGE_NTFY_PWRERR */ return WMD_E_TIMEOUT; } else { - DBG_Trace(DBG_LEVEL7, "SleepDSP: DSP STANDBY Pwr state %x \n", - pwrState); - /* Update the Bridger Driver state */ if (dsp_test_sleepstate == HW_PWR_STATE_OFF) pDevContext->dwBrdState = BRD_HIBERNATION; @@ -319,9 +306,6 @@ DSP_STATUS WakeDSP(struct WMD_DEV_CONTEXT *pDevContext, IN void *pArgs) #ifdef CONFIG_BRIDGE_DEBUG HW_PWR_IVA2StateGet(resources.dwPrmBase, HW_PWR_DOMAIN_DSP, &pwrState); - DBG_Trace(DBG_LEVEL7, - "\nWakeDSP: Power State After sending Interrupt " - "to DSP %x\n", pwrState); #endif /* CONFIG_BRIDGE_DEBUG */ /* Set the device state to RUNNIG */ @@ -359,9 +343,6 @@ DSP_STATUS DSPPeripheralClkCtrl(struct WMD_DEV_CONTEXT *pDevContext, if (DSP_FAILED(status)) return DSP_EFAIL; - DBG_Trace(DBG_LEVEL3, "DSPPeripheralClkCtrl : extClk+Cmd = 0x%x \n", - extClk); - extClkId = extClk & MBX_PM_CLK_IDMASK; /* process the power message -- TODO, keep it in a separate function */ @@ -385,8 +366,6 @@ DSP_STATUS DSPPeripheralClkCtrl(struct WMD_DEV_CONTEXT *pDevContext, switch (extClkCmd) { case BPWR_DisableClock: /* Call BP to disable the needed clock */ - DBG_Trace(DBG_LEVEL3, - "DSPPeripheralClkCtrl : Disable CLK for \n"); status1 = CLK_Disable(BPWR_Clks[clkIdIndex].intClk); status = CLK_Disable(BPWR_Clks[clkIdIndex].funClk); if (BPWR_CLKID[clkIdIndex] == BPWR_MCBSP1) { @@ -410,8 +389,6 @@ DSP_STATUS DSPPeripheralClkCtrl(struct WMD_DEV_CONTEXT *pDevContext, } break; case BPWR_EnableClock: - DBG_Trace(DBG_LEVEL3, - "DSPPeripheralClkCtrl : Enable CLK for \n"); status1 = CLK_Enable(BPWR_Clks[clkIdIndex].intClk); status = CLK_Enable(BPWR_Clks[clkIdIndex].funClk); if (BPWR_CLKID[clkIdIndex] == BPWR_MCBSP1) { diff --git a/drivers/dsp/bridge/wmd/tiomap_io.c b/drivers/dsp/bridge/wmd/tiomap_io.c index 4b6ee90..2d32b26 100644 --- a/drivers/dsp/bridge/wmd/tiomap_io.c +++ b/drivers/dsp/bridge/wmd/tiomap_io.c @@ -86,11 +86,8 @@ DSP_STATUS ReadExtDspData(struct WMD_DEV_CONTEXT *hDevContext, if (DSP_SUCCEEDED(status)) { if ((dwDSPAddr <= ulTraceSecEnd) && - (dwDSPAddr >= ulTraceSecBeg)) { - DBG_Trace(DBG_LEVEL5, "Reading from DSP Trace" - "section 0x%x \n", dwDSPAddr); + (dwDSPAddr >= ulTraceSecBeg)) bTraceRead = true; - } } /* If reading from TRACE, force remap/unmap */ @@ -142,20 +139,13 @@ DSP_STATUS ReadExtDspData(struct WMD_DEV_CONTEXT *hDevContext, DBC_Assert(ulTLBBaseVirt <= ulShmBaseVirt); dwExtProgVirtMem = pDevContext->aTLBEntry[0].ulGppVa; - if (bTraceRead) { - DBG_Trace(DBG_LEVEL7, "ReadExtDspData: " - "GPP VA pointing to SHMMEMBASE 0x%x \n", - dwExtProgVirtMem); - } else { + if (!bTraceRead) { ulShmOffsetVirt = ulShmBaseVirt - ulTLBBaseVirt; ulShmOffsetVirt += PG_ALIGN_HIGH(ulExtEnd - ulDynExtBase + 1, HW_PAGE_SIZE_64KB); dwExtProgVirtMem -= ulShmOffsetVirt; dwExtProgVirtMem += (ulExtBase - ulDynExtBase); - DBG_Trace(DBG_LEVEL7, "ReadExtDspData: " - "GPP VA pointing to EXTMEMBASE 0x%x \n", - dwExtProgVirtMem); pDevContext->dwDspExtBaseAddr = dwExtProgVirtMem; @@ -266,11 +256,8 @@ DSP_STATUS WriteExtDspData(struct WMD_DEV_CONTEXT *pDevContext, } if (DSP_SUCCEEDED(retVal)) { if ((dwDSPAddr <= ulTraceSecEnd) && - (dwDSPAddr >= ulTraceSecBeg)) { - DBG_Trace(DBG_LEVEL5, "Writing to DSP Trace " - "section 0x%x \n", dwDSPAddr); + (dwDSPAddr >= ulTraceSecBeg)) bTraceLoad = true; - } } /* If dynamic, force remap/unmap */ @@ -352,9 +339,6 @@ DSP_STATUS WriteExtDspData(struct WMD_DEV_CONTEXT *pDevContext, dwExtProgVirtMem = hostRes.dwMemBase[1]; dwExtProgVirtMem += (ulExtBase - ulDynExtBase); } - DBG_Trace(DBG_LEVEL7, "WriteExtDspData: GPP VA " - "pointing to EXTMEMBASE 0x%x \n", - dwExtProgVirtMem); pDevContext->dwDspExtBaseAddr = (u32)MEM_LinearAddress((void *)dwExtProgVirtMem, diff --git a/drivers/dsp/bridge/wmd/ue_deh.c b/drivers/dsp/bridge/wmd/ue_deh.c index dd23387..032a6e3 100644 --- a/drivers/dsp/bridge/wmd/ue_deh.c +++ b/drivers/dsp/bridge/wmd/ue_deh.c @@ -117,7 +117,6 @@ DSP_STATUS WMD_DEH_Create(OUT struct DEH_MGR **phDehMgr, *phDehMgr = NULL; } else { *phDehMgr = (struct DEH_MGR *)pDehMgr; - DBG_Trace(DBG_LEVEL1, "ISR_IRQ Object 0x%x \n", pDehMgr); } return status; @@ -143,7 +142,6 @@ DSP_STATUS WMD_DEH_Destroy(struct DEH_MGR *hDehMgr) /* Free DPC object */ tasklet_kill(&pDehMgr->dpc_tasklet); - DBG_Trace(GT_2CLASS, "DPC_Destroy: SUCCESS\n"); /* Deallocate the DEH manager object */ MEM_FreeObject(pDehMgr); @@ -229,8 +227,6 @@ void WMD_DEH_Notify(struct DEH_MGR *hDehMgr, u32 ulEventMask, MEM_PAGED); memPhysical = VirtToPhys(PG_ALIGN_LOW((u32)dummyVaAddr, PG_SIZE_4K)); -DBG_Trace(DBG_LEVEL6, "WMD_DEH_Notify: DSP_MMUFAULT, " - "mem Physical= 0x%x\n", memPhysical); pDevContext = (struct WMD_DEV_CONTEXT *) pDehMgr->hWmdContext; /* Reset the dynamic mmu index to fixed count if it @@ -242,9 +238,6 @@ DBG_Trace(DBG_LEVEL6, "WMD_DEH_Notify: DSP_MMUFAULT, " pDevContext->numTLBEntries = pDevContext-> fixedTLBEntries; } - DBG_Trace(DBG_LEVEL6, "Adding TLB Entry %d: VA: 0x%x, " - "PA: 0x%x\n", pDevContext-> - numTLBEntries, faultAddr, memPhysical); if (DSP_SUCCEEDED(status)) { hwStatus = HW_MMU_TLBAdd(resources.dwDmmuBase, memPhysical, faultAddr, -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 07/18] DSPBRIDGE: Remove debug statements for success in pmgr 2010-02-16 8:42 ` [PATCH 06/18] DSPBRIDGE: Remove debug statements for success in wmd Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 08/18] DSPBRIDGE: Remove debug statements for success in services Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna This patch removes debug statements used to print a successful status or printed during normal execution, as they just polute the logs if trying to look for a failure. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/pmgr/chnl.c | 3 --- drivers/dsp/bridge/pmgr/cmm.c | 15 +-------------- drivers/dsp/bridge/pmgr/cod.c | 6 ------ drivers/dsp/bridge/pmgr/dbll.c | 16 +--------------- drivers/dsp/bridge/pmgr/dev.c | 8 -------- drivers/dsp/bridge/pmgr/io.c | 3 --- drivers/dsp/bridge/pmgr/msg.c | 2 -- 7 files changed, 2 insertions(+), 51 deletions(-) diff --git a/drivers/dsp/bridge/pmgr/chnl.c b/drivers/dsp/bridge/pmgr/chnl.c index 66464c7..802f71c 100644 --- a/drivers/dsp/bridge/pmgr/chnl.c +++ b/drivers/dsp/bridge/pmgr/chnl.c @@ -111,9 +111,6 @@ DSP_STATUS CHNL_Create(OUT struct CHNL_MGR **phChnlMgr, pChnlMgr->pIntfFxns = pIntfFxns; /* Finally, return the new channel manager handle: */ *phChnlMgr = hChnlMgr; - GT_1trace(CHNL_DebugMask, GT_1CLASS, - "CHNL_Create: Success pChnlMgr:" - "0x%x\n", pChnlMgr); } } diff --git a/drivers/dsp/bridge/pmgr/cmm.c b/drivers/dsp/bridge/pmgr/cmm.c index 53855a9..e422dc5 100644 --- a/drivers/dsp/bridge/pmgr/cmm.c +++ b/drivers/dsp/bridge/pmgr/cmm.c @@ -237,9 +237,6 @@ void *CMM_CallocBuf(struct CMM_OBJECT *hCmmMgr, u32 uSize, *ppBufVA = (void *)pNode->dwVA; } } - GT_3trace(CMM_debugMask, GT_3CLASS, - "CMM_CallocBuf dwPA %x, dwVA %x uSize" - "%x\n", pNode->dwPA, pNode->dwVA, uSize); SYNC_LeaveCS(pCmmMgr->hCmmLock); } return pBufPA; @@ -277,9 +274,6 @@ DSP_STATUS CMM_Create(OUT struct CMM_OBJECT **phCmmMgr, sysInfo.dwAllocationGranularity = PAGE_SIZE; sysInfo.dwNumberOfProcessors = 1; if (DSP_SUCCEEDED(status)) { - GT_1trace(CMM_debugMask, GT_5CLASS, - "CMM_Create: Got system page size" - "= 0x%x\t\n", sysInfo.dwPageSize); pCmmObject->dwPageSize = sysInfo.dwPageSize; } else { GT_0trace(CMM_debugMask, GT_7CLASS, @@ -1135,10 +1129,6 @@ DSP_STATUS CMM_XlatorInfo(struct CMM_XLATOROBJECT *hXlator, IN OUT u8 **pAddr, /* set translators virtual address range */ pXlator->dwVirtBase = (u32)*pAddr; pXlator->ulVirtSize = ulSize; - GT_2trace(CMM_debugMask, GT_3CLASS, - "pXlator->dwVirtBase %x, " - "ulVirtSize %x\n", pXlator->dwVirtBase, - pXlator->ulVirtSize); } else { /* return virt base address */ *pAddr = (u8 *)pXlator->dwVirtBase; } @@ -1218,10 +1208,7 @@ loop_cont: GT_2trace(CMM_debugMask, GT_7CLASS, "CMM_XlatorTranslate: Can't translate" " address: 0x%x xType %x\n", pAddr, xType); - } else { - GT_3trace(CMM_debugMask, GT_3CLASS, - "CMM_XlatorTranslate: pAddr %x, xType" - " %x, dwAddrXlate %x\n", pAddr, xType, dwAddrXlate); } + return (void *)dwAddrXlate; } diff --git a/drivers/dsp/bridge/pmgr/cod.c b/drivers/dsp/bridge/pmgr/cod.c index 6f659e5..25921fb 100644 --- a/drivers/dsp/bridge/pmgr/cod.c +++ b/drivers/dsp/bridge/pmgr/cod.c @@ -645,17 +645,11 @@ DSP_STATUS COD_OpenBase(struct COD_MANAGER *hMgr, IN char *pszCoffPath, /* if we previously opened a base image, close it now */ if (hMgr->baseLib) { if (hMgr->fLoaded) { - GT_0trace(COD_debugMask, GT_7CLASS, - "Base Image is already loaded. " - "Unloading it...\n"); hMgr->fxns.unloadFxn(hMgr->baseLib, &hMgr->attrs); hMgr->fLoaded = false; } hMgr->fxns.closeFxn(hMgr->baseLib); hMgr->baseLib = NULL; - } else { - GT_0trace(COD_debugMask, GT_1CLASS, - "COD_OpenBase: Opening the base image ...\n"); } status = hMgr->fxns.openFxn(hMgr->target, pszCoffPath, flags, &lib); if (DSP_FAILED(status)) { diff --git a/drivers/dsp/bridge/pmgr/dbll.c b/drivers/dsp/bridge/pmgr/dbll.c index 22e08bd..367597d 100644 --- a/drivers/dsp/bridge/pmgr/dbll.c +++ b/drivers/dsp/bridge/pmgr/dbll.c @@ -1313,12 +1313,6 @@ static int rmmAlloc(struct Dynamic_Loader_Allocate *this, segId = 2; } } - if (segId != -1) { - GT_2trace(DBLL_debugMask, GT_5CLASS, - "Extracted values for memory" - " granularity req [%d] segId [%d]\n", - req, segId); - } } func_cont: kfree(szSectName); @@ -1332,9 +1326,7 @@ func_cont: allocSize = info->size + GEM_L1P_PREFETCH_SIZE; else allocSize = info->size; - GT_2trace(DBLL_debugMask, GT_5CLASS, - "Beg info->run_addr = 0x%x, info->load_addr= 0x%x\n", - info->run_addr, info->load_addr); + if (info->load_addr != info->run_addr) runAddrFlag = 1; /* TODO - ideally, we can pass the alignment requirement also @@ -1393,12 +1385,6 @@ static void rmmDealloc(struct Dynamic_Loader_Allocate *this, attrs.symHandle, segid, info->load_addr / DSPWORDSIZE, freeSize, false); } - if (DSP_SUCCEEDED(status)) { - GT_2trace(DBLL_debugMask, GT_5CLASS, - "Remote dealloc: base = 0x%lx len =" - "0x%lx\n", info->load_addr / DSPWORDSIZE, - freeSize / DSPWORDSIZE); - } } /* Dynamic_Loader_Initialize */ diff --git a/drivers/dsp/bridge/pmgr/dev.c b/drivers/dsp/bridge/pmgr/dev.c index 5719519..c6561a4 100644 --- a/drivers/dsp/bridge/pmgr/dev.c +++ b/drivers/dsp/bridge/pmgr/dev.c @@ -279,9 +279,6 @@ DSP_STATUS DEV_CreateDevice(OUT struct DEV_OBJECT **phDevObject, * else, cleanup and return NULL in the OUT parameter. */ if (DSP_SUCCEEDED(status)) { *phDevObject = pDevObject; - GT_1trace(debugMask, GT_1CLASS, - "DEV_CreateDevice Succeeded \nDevObject " - "0x%x\n", pDevObject); } else { kfree(pDevObject->procList); @@ -892,11 +889,6 @@ DSP_STATUS DEV_RemoveDevice(struct CFG_DEVNODE *hDevNode) pDevObject = (struct DEV_OBJECT *)hDevObject; /* Destroy the device object. */ status = DEV_DestroyDevice(hDevObject); - if (DSP_SUCCEEDED(status)) { - /* Null out the handle stored with the DevNode. */ - GT_0trace(debugMask, GT_1CLASS, - "DEV_RemoveDevice, success"); - } } return status; diff --git a/drivers/dsp/bridge/pmgr/io.c b/drivers/dsp/bridge/pmgr/io.c index 3b1156a..e83178b 100644 --- a/drivers/dsp/bridge/pmgr/io.c +++ b/drivers/dsp/bridge/pmgr/io.c @@ -94,9 +94,6 @@ DSP_STATUS IO_Create(OUT struct IO_MGR **phIOMgr, struct DEV_OBJECT *hDevObject, /* Return the new channel manager handle: */ *phIOMgr = hIOMgr; - GT_1trace(IO_DebugMask, GT_1CLASS, - "IO_Create: Success hIOMgr: 0x%x\n", - hIOMgr); } } diff --git a/drivers/dsp/bridge/pmgr/msg.c b/drivers/dsp/bridge/pmgr/msg.c index 1ba1c88..69f39a8 100644 --- a/drivers/dsp/bridge/pmgr/msg.c +++ b/drivers/dsp/bridge/pmgr/msg.c @@ -81,8 +81,6 @@ DSP_STATUS MSG_Create(OUT struct MSG_MGR **phMsgMgr, /* Finally, return the new message manager handle: */ *phMsgMgr = hMsgMgr; - GT_1trace(MSG_debugMask, GT_1CLASS, - "MSG_Create: Success pMsgMgr: 0x%x\n", pMsgMgr); } else { status = DSP_EFAIL; } -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 08/18] DSPBRIDGE: Remove debug statements for success in services 2010-02-16 8:42 ` [PATCH 07/18] DSPBRIDGE: Remove debug statements for success in pmgr Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 09/18] DSPBRIDGE: Remove excessive debug statements for rmgr Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna This patch removes debug statements used to print a successful status or printed during normal execution, as they just polute the logs if trying to look for a failure. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/services/cfg.c | 62 ++++++------------------------------ drivers/dsp/bridge/services/clk.c | 10 ------ drivers/dsp/bridge/services/mem.c | 21 +----------- drivers/dsp/bridge/services/sync.c | 20 +----------- 4 files changed, 13 insertions(+), 100 deletions(-) diff --git a/drivers/dsp/bridge/services/cfg.c b/drivers/dsp/bridge/services/cfg.c index 7b2a896..de2a7ab 100644 --- a/drivers/dsp/bridge/services/cfg.c +++ b/drivers/dsp/bridge/services/cfg.c @@ -74,13 +74,9 @@ DSP_STATUS CFG_GetAutoStart(struct CFG_DEVNODE *hDevNode, status = CFG_E_RESOURCENOTAVAIL; } #ifdef CONFIG_BRIDGE_DEBUG - if (DSP_SUCCEEDED(status)) { - GT_0trace(CFG_debugMask, GT_1CLASS, - "CFG_GetAutoStart SUCCESS \n"); - } else { + if (DSP_FAILED(status)) GT_0trace(CFG_debugMask, GT_6CLASS, "CFG_GetAutoStart Failed \n"); - } #endif DBC_Ensure((status == DSP_SOK && (*pdwAutoStart == 0 || *pdwAutoStart == 1)) @@ -110,9 +106,6 @@ DSP_STATUS CFG_GetDevObject(struct CFG_DEVNODE *hDevNode, OUT u32 *pdwValue) /* check the device string and then call the REG_SetValue*/ if (!(strcmp((char *)((struct DRV_EXT *)hDevNode)->szString, "TIOMAP1510"))) { - GT_0trace(CFG_debugMask, GT_1CLASS, - "Fetching DSP Device from " - "Registry \n"); status = REG_GetValue("DEVICE_DSP", (u8 *)pdwValue, &dwBufSize); } else { @@ -121,14 +114,9 @@ DSP_STATUS CFG_GetDevObject(struct CFG_DEVNODE *hDevNode, OUT u32 *pdwValue) } } #ifdef CONFIG_BRIDGE_DEBUG - if (DSP_SUCCEEDED(status)) { - GT_1trace(CFG_debugMask, GT_1CLASS, - "CFG_GetDevObject SUCCESS DevObject" - ": 0x%x\n ", *pdwValue); - } else { + if (DSP_FAILED(status)) GT_0trace(CFG_debugMask, GT_6CLASS, "CFG_GetDevObject Failed \n"); - } #endif return status; } @@ -152,10 +140,7 @@ DSP_STATUS CFG_GetDSPResources(struct CFG_DEVNODE *hDevNode, status = REG_GetValue(DSPRESOURCES, (u8 *)pDSPResTable, &dwResSize); } - if (DSP_SUCCEEDED(status)) { - GT_0trace(CFG_debugMask, GT_1CLASS, - "CFG_GetDSPResources SUCCESS\n"); - } else { + if (DSP_FAILED(status)) { status = CFG_E_RESOURCENOTAVAIL; GT_0trace(CFG_debugMask, GT_6CLASS, "CFG_GetDSPResources Failed \n"); @@ -196,14 +181,9 @@ DSP_STATUS CFG_GetExecFile(struct CFG_DEVNODE *hDevNode, u32 ulBufSize, } #ifdef CONFIG_BRIDGE_DEBUG - if (DSP_SUCCEEDED(status)) { - GT_1trace(CFG_debugMask, GT_1CLASS, - "CFG_GetExecFile SUCCESS Exec File" - "name : %s\n ", pstrExecFile); - } else { + if (DSP_FAILED(status)) GT_0trace(CFG_debugMask, GT_6CLASS, "CFG_GetExecFile Failed \n"); - } #endif DBC_Ensure(((status == DSP_SOK) && (strlen(pstrExecFile) <= ulBufSize)) || (status != DSP_SOK)); @@ -235,13 +215,9 @@ DSP_STATUS CFG_GetHostResources(struct CFG_DEVNODE *hDevNode, } } #ifdef CONFIG_BRIDGE_DEBUG - if (DSP_SUCCEEDED(status)) { - GT_0trace(CFG_debugMask, GT_1CLASS, - "CFG_GetHostResources SUCCESS \n"); - } else { + if (DSP_FAILED(status)) GT_0trace(CFG_debugMask, GT_6CLASS, "CFG_GetHostResources Failed \n"); - } #endif return status; } @@ -272,11 +248,7 @@ DSP_STATUS CFG_GetObject(OUT u32 *pdwValue, u32 dwType) default: break; } - if (DSP_SUCCEEDED(status)) { - GT_1trace(CFG_debugMask, GT_1CLASS, - "CFG_GetObject SUCCESS DrvObject: " - "0x%x\n ", *pdwValue); - } else { + if (DSP_FAILED(status)) { *pdwValue = 0; GT_0trace(CFG_debugMask, GT_6CLASS, "CFG_GetObject Failed \n"); } @@ -294,7 +266,6 @@ bool CFG_Init(void) { struct CFG_DSPRES dspResources; GT_create(&CFG_debugMask, "CF"); /* CF for ConFig */ - GT_0trace(CFG_debugMask, GT_5CLASS, "Intializing DSP Registry Info \n"); dspResources.uChipType = DSPTYPE_64; dspResources.cChips = 1; @@ -303,12 +274,8 @@ bool CFG_Init(void) dspResources.aMemDesc[0].uMemType = 0; dspResources.aMemDesc[0].ulMin = 0; dspResources.aMemDesc[0].ulMax = 0; - if (DSP_SUCCEEDED(REG_SetValue(DSPRESOURCES, (u8 *)&dspResources, - sizeof(struct CFG_DSPRES)))) { - GT_0trace(CFG_debugMask, GT_5CLASS, - "Initialized DSP resources in " - "Registry \n"); - } else + if (DSP_FAILED(REG_SetValue(DSPRESOURCES, (u8 *)&dspResources, + sizeof(struct CFG_DSPRES)))) GT_0trace(CFG_debugMask, GT_5CLASS, "Failed to Initialize DSP resources" " in Registry \n"); @@ -333,8 +300,6 @@ DSP_STATUS CFG_SetDevObject(struct CFG_DEVNODE *hDevNode, u32 dwValue) /* Store the WCD device object in the Registry */ if (!(strcmp((char *)hDevNode, "TIOMAP1510"))) { - GT_0trace(CFG_debugMask, GT_1CLASS, - "Registering the DSP Device \n"); status = REG_SetValue("DEVICE_DSP", (u8 *)&dwValue, dwBuffSize); } else { @@ -343,13 +308,9 @@ DSP_STATUS CFG_SetDevObject(struct CFG_DEVNODE *hDevNode, u32 dwValue) } } #ifdef CONFIG_BRIDGE_DEBUG - if (DSP_SUCCEEDED(status)) { - GT_0trace(CFG_debugMask, GT_1CLASS, - "CFG_SetDevObject SUCCESS \n"); - } else { + if (DSP_FAILED(status)) GT_0trace(CFG_debugMask, GT_6CLASS, "CFG_SetDevObject Failed \n"); - } #endif return status; } @@ -376,11 +337,8 @@ DSP_STATUS CFG_SetObject(u32 dwValue, u32 dwType) break; } #ifdef CONFIG_BRIDGE_DEBUG - if (DSP_SUCCEEDED(status)) - GT_0trace(CFG_debugMask, GT_1CLASS, "CFG_SetObject SUCCESS \n"); - else + if (DSP_FAILED(status)) GT_0trace(CFG_debugMask, GT_6CLASS, "CFG_SetObject Failed \n"); - #endif return status; } diff --git a/drivers/dsp/bridge/services/clk.c b/drivers/dsp/bridge/services/clk.c index 041e789..1e8fe45 100644 --- a/drivers/dsp/bridge/services/clk.c +++ b/drivers/dsp/bridge/services/clk.c @@ -144,12 +144,6 @@ bool CLK_Init(void) SERVICES_Clks[i].clk_name, SERVICES_Clks[i].id); /* should we fail here?? */ - } else { - GT_2trace(CLK_debugMask, GT_7CLASS, - "CLK_Init: PASS and Clk handle %s, " - "CLK dev id = %d\n", - SERVICES_Clks[i].clk_name, - SERVICES_Clks[i].id); } SERVICES_Clks[i].clk_handle = clk_handle; i++; @@ -247,10 +241,6 @@ DSP_STATUS CLK_Disable(IN enum SERVICES_ClkId clk_id) SERVICES_Clks[clk_id].clk_name, SERVICES_Clks[clk_id].id); } else if (clkUseCnt == 0) { - GT_2trace(CLK_debugMask, GT_4CLASS, "CLK_Disable: CLK %s," - "CLK dev id= %d is already disabled\n", - SERVICES_Clks[clk_id].clk_name, - SERVICES_Clks[clk_id].id); return status; } if (clk_id == SERVICESCLK_ssi_ick) diff --git a/drivers/dsp/bridge/services/mem.c b/drivers/dsp/bridge/services/mem.c index 852f9d3..189ebfc 100644 --- a/drivers/dsp/bridge/services/mem.c +++ b/drivers/dsp/bridge/services/mem.c @@ -69,18 +69,11 @@ void MEM_ExtPhysPoolInit(u32 poolPhysBase, u32 poolSize) extMemPool.virtMemBase = poolVirtBase; extMemPool.nextPhysAllocPtr = poolPhysBase; extPhysMemPoolEnabled = true; - GT_3trace(MEM_debugMask, GT_1CLASS, - "ExtMemory Pool details " "Pool" - "Physical mem base = %0x " "Pool Physical mem size " - "= %0x" "Pool Virtual mem base = %0x \n", - poolPhysBase, poolSize, poolVirtBase); } } void MEM_ExtPhysPoolRelease(void) { - GT_0trace(MEM_debugMask, GT_1CLASS, - "Releasing External memory pool \n"); if (extPhysMemPoolEnabled) { iounmap((void *)(extMemPool.virtMemBase)); extPhysMemPoolEnabled = false; @@ -99,15 +92,9 @@ static void *MEM_ExtPhysMemAlloc(u32 bytes, u32 align, OUT u32 *pPhysAddr) u32 offset; u32 virtAddr; - GT_2trace(MEM_debugMask, GT_1CLASS, - "Ext Memory Allocation" "bytes=0x%x , " - "align=0x%x \n", bytes, align); - if (align == 0) { - GT_0trace(MEM_debugMask, GT_7CLASS, - "ExtPhysical Memory Allocation " - "No alignment request in allocation call !! \n"); + if (align == 0) align = 1; - } + if (bytes > ((extMemPool.physMemBase + extMemPool.physMemSize) - extMemPool.nextPhysAllocPtr)) { GT_1trace(MEM_debugMask, GT_7CLASS, @@ -130,10 +117,6 @@ static void *MEM_ExtPhysMemAlloc(u32 bytes, u32 align, OUT u32 *pPhysAddr) extMemPool.nextPhysAllocPtr = newAllocPtr + bytes; virtAddr = extMemPool.virtMemBase + (newAllocPtr - extMemPool.physMemBase); - GT_2trace(MEM_debugMask, GT_1CLASS, - "Ext Memory Allocation succedded " - "phys address=0x%x , virtaddress=0x%x \n", - newAllocPtr, virtAddr); return (void *)virtAddr; } else { *pPhysAddr = 0; diff --git a/drivers/dsp/bridge/services/sync.c b/drivers/dsp/bridge/services/sync.c index 3ba97ca..9be4d8c 100644 --- a/drivers/dsp/bridge/services/sync.c +++ b/drivers/dsp/bridge/services/sync.c @@ -202,23 +202,13 @@ DSP_STATUS SYNC_SetEvent(struct SYNC_OBJECT *hEvent) if (MEM_IsValidHandle(hEvent, SIGNATURE)) { spin_lock_irqsave(&hEvent->sync_lock, flags); - GT_1trace(SYNC_debugMask, GT_6CLASS, - "SYNC_SetEvent: pEvent->pWaitObj " - "= 0x%x \n", pEvent->pWaitObj); - if (pEvent->pWaitObj) - GT_1trace(SYNC_debugMask, GT_6CLASS, "SYNC_SetEvent: " - "pEvent->pWaitObj->state = 0x%x \n", - pEvent->pWaitObj->state); + if (pEvent->pWaitObj != NULL && test_and_set(&pEvent->pWaitObj->state, wo_signalled) == wo_waiting) { - pEvent->state = so_reset; pEvent->pWaitObj->signalling_event = pEvent; up(&pEvent->pWaitObj->sem); - GT_1trace(SYNC_debugMask, GT_6CLASS, - "SYNC_SetEvent: Unlock " - "Semaphore for hEvent 0x%x\n", hEvent); } else { pEvent->state = so_signalled; } @@ -289,12 +279,8 @@ DSP_STATUS SYNC_WaitOnMultipleEvents(struct SYNC_OBJECT **hSyncEvents, for (curr = 0; curr < uCount; curr++) { hSyncEvents[curr]->pWaitObj = Wp; if (hSyncEvents[curr]->state == so_signalled) { - GT_0trace(SYNC_debugMask, GT_6CLASS, - "Detected signaled Event !!!\n"); if (test_and_set(&(Wp->state), wo_signalled) == wo_waiting) { - GT_0trace(SYNC_debugMask, GT_6CLASS, - "Setting Signal Event!!!\n"); hSyncEvents[curr]->state = so_reset; Wp->signalling_event = hSyncEvents[curr]; } @@ -314,8 +300,6 @@ DSP_STATUS SYNC_WaitOnMultipleEvents(struct SYNC_OBJECT **hSyncEvents, add_timer(&timeout); } if (down_interruptible(&(Wp->sem))) { - GT_0trace(SYNC_debugMask, GT_7CLASS, "SYNC: " - "WaitOnMultipleEvents Interrupted by signal\n"); /* * Most probably we are interrupted by a fake signal * from freezer. Return -ERESTARTSYS so that this @@ -425,7 +409,6 @@ DSP_STATUS SYNC_EnterCS(struct SYNC_CSOBJECT *hCSObj) } else if (MEM_IsValidHandle(hCSObj, SIGNATUREDPCCS)) { struct SYNC_DPCCSOBJECT *pDPCCSObj = (struct SYNC_DPCCSOBJECT *)hCSObj; - GT_0trace(SYNC_debugMask, GT_ENTER, "SYNC_EnterCS DPC\n"); spin_lock_bh(&pDPCCSObj->sync_dpccs_lock); pDPCCSObj->count--; if (pDPCCSObj->count != 0) { @@ -527,7 +510,6 @@ DSP_STATUS SYNC_LeaveCS(struct SYNC_CSOBJECT *hCSObj) spin_lock_bh(&pDPCCSObj->sync_dpccs_lock); } spin_unlock_bh(&pDPCCSObj->sync_dpccs_lock); - GT_0trace(SYNC_debugMask, GT_ENTER, "SYNC_LeaveCS DPC\n"); } else { status = DSP_EHANDLE; GT_1trace(SYNC_debugMask, GT_6CLASS, -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 09/18] DSPBRIDGE: Remove excessive debug statements for rmgr 2010-02-16 8:42 ` [PATCH 08/18] DSPBRIDGE: Remove debug statements for success in services Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 10/18] DSPBRIDGE: Remove excessive debug statements for wmd Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna Removed debug statements that print redundant errors where returned statuses should be enough in case of failure. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/rmgr/dbdcd.c | 64 +-------- drivers/dsp/bridge/rmgr/disp.c | 102 ++------------- drivers/dsp/bridge/rmgr/drv.c | 16 --- drivers/dsp/bridge/rmgr/dspdrv.c | 11 +- drivers/dsp/bridge/rmgr/mgr.c | 40 +----- drivers/dsp/bridge/rmgr/nldr.c | 28 +---- drivers/dsp/bridge/rmgr/node.c | 92 +------------ drivers/dsp/bridge/rmgr/proc.c | 268 +++++--------------------------------- drivers/dsp/bridge/rmgr/rmm.c | 15 +-- drivers/dsp/bridge/rmgr/strm.c | 56 ++------- 10 files changed, 83 insertions(+), 609 deletions(-) diff --git a/drivers/dsp/bridge/rmgr/dbdcd.c b/drivers/dsp/bridge/rmgr/dbdcd.c index 0a59a62..5e07abd 100644 --- a/drivers/dsp/bridge/rmgr/dbdcd.c +++ b/drivers/dsp/bridge/rmgr/dbdcd.c @@ -96,15 +96,12 @@ DSP_STATUS DCD_AutoRegister(IN struct DCD_MANAGER *hDcdMgr, DBC_Require(cRefs > 0); - if (IsValidHandle(hDcdMgr)) { + if (IsValidHandle(hDcdMgr)) status = DCD_GetObjects(hDcdMgr, pszCoffPath, (DCD_REGISTERFXN)DCD_RegisterObject, (void *)pszCoffPath); - } else { + else status = DSP_EHANDLE; - GT_0trace(curTrace, GT_6CLASS, - "DCD_AutoRegister: invalid DCD manager handle.\n"); - } return status; } @@ -121,15 +118,11 @@ DSP_STATUS DCD_AutoUnregister(IN struct DCD_MANAGER *hDcdMgr, DBC_Require(cRefs > 0); - if (IsValidHandle(hDcdMgr)) { + if (IsValidHandle(hDcdMgr)) status = DCD_GetObjects(hDcdMgr, pszCoffPath, (DCD_REGISTERFXN)DCD_RegisterObject, NULL); - } else { + else status = DSP_EHANDLE; - GT_0trace(curTrace, GT_6CLASS, - "DCD_AutoUnregister: invalid DCD manager" - " handle.\n"); - } return status; } @@ -150,12 +143,8 @@ DSP_STATUS DCD_CreateManager(IN char *pszZlDllName, DBC_Require(phDcdMgr); status = COD_Create(&hCodMgr, pszZlDllName, NULL); - - if (DSP_FAILED(status)) { - GT_0trace(curTrace, GT_6CLASS, - "DCD_CreateManager: COD_Create failed\n"); + if (DSP_FAILED(status)) goto func_end; - } /* Create a DCD object. */ MEM_AllocObject(pDcdMgr, struct DCD_MANAGER, SIGNATURE); @@ -173,9 +162,6 @@ DSP_STATUS DCD_CreateManager(IN char *pszZlDllName, * COD manager. */ COD_Delete(hCodMgr); - - GT_0trace(curTrace, GT_6CLASS, - "DCD_CreateManager: MEM_AllocObject failed\n"); } DBC_Ensure((DSP_SUCCEEDED(status)) || ((hCodMgr == NULL) && @@ -206,9 +192,6 @@ DSP_STATUS DCD_DestroyManager(IN struct DCD_MANAGER *hDcdMgr) MEM_FreeObject(pDcdMgr); status = DSP_SOK; - } else { - GT_0trace(curTrace, GT_6CLASS, - "DCD_DestroyManager: invalid DCD manager handle.\n"); } return status; @@ -306,9 +289,6 @@ DSP_STATUS DCD_EnumerateObject(IN s32 cIndex, IN enum DSP_DCDOBJTYPE objType, status = DSP_SENUMCOMPLETE; } else { status = DSP_EFAIL; - GT_1trace(curTrace, GT_6CLASS, - "DCD_EnumerateObject: REG_EnumValue" - " failed, status = 0x%x\n", status); } } @@ -414,8 +394,6 @@ DSP_STATUS DCD_GetObjectDef(IN struct DCD_MANAGER *hDcdMgr, if (!IsValidHandle(hDcdMgr)) { status = DSP_EHANDLE; - GT_0trace(curTrace, GT_6CLASS, "DCD_GetObjectDef: invalid " - "DCD manager handle.\n"); goto func_end; } @@ -461,8 +439,6 @@ DSP_STATUS DCD_GetObjectDef(IN struct DCD_MANAGER *hDcdMgr, if (DSP_FAILED(status)) { status = DSP_EUUID; - GT_0trace(curTrace, GT_6CLASS, "DCD_GetObjectDef: " - "REG_GetValue() failed\n"); goto func_end; } @@ -470,8 +446,6 @@ DSP_STATUS DCD_GetObjectDef(IN struct DCD_MANAGER *hDcdMgr, status = COD_Open(pDcdMgr->hCodMgr, szRegData, COD_NOLOAD, &lib); if (DSP_FAILED(status)) { status = DSP_EDCDLOADBASE; - GT_0trace(curTrace, GT_6CLASS, "DCD_GetObjectDef: " - "COD_OpenBase() failed\n"); goto func_end; } @@ -488,8 +462,6 @@ DSP_STATUS DCD_GetObjectDef(IN struct DCD_MANAGER *hDcdMgr, status = COD_GetSection(lib, szSectName, &ulAddr, &ulLen); if (DSP_FAILED(status)) { status = DSP_EDCDGETSECT; - GT_0trace(curTrace, GT_6CLASS, "DCD_GetObjectDef:" - " COD_GetSection() failed\n"); goto func_end; } @@ -519,15 +491,10 @@ DSP_STATUS DCD_GetObjectDef(IN struct DCD_MANAGER *hDcdMgr, /* Parse the content of the COFF buffer. */ status = GetAttrsFromBuf(pszCoffBuf, ulLen, objType, pObjDef); - if (DSP_FAILED(status)) { + if (DSP_FAILED(status)) status = DSP_EDCDPARSESECT; - GT_0trace(curTrace, GT_6CLASS, "DCD_GetObjectDef: " - "GetAttrsFromBuf() failed\n"); - } } else { status = DSP_EDCDREADSECT; - GT_0trace(curTrace, GT_6CLASS, "DCD_GetObjectDef: " - "COD_ReadSection() failed\n"); } /* Free the previously allocated dynamic buffer. */ @@ -562,8 +529,6 @@ DSP_STATUS DCD_GetObjects(IN struct DCD_MANAGER *hDcdMgr, IN char *pszCoffPath, DBC_Require(cRefs > 0); if (!IsValidHandle(hDcdMgr)) { status = DSP_EHANDLE; - GT_0trace(curTrace, GT_6CLASS, - "DCD_GetObjects: invalid DCD manager handle.\n"); goto func_end; } @@ -571,8 +536,6 @@ DSP_STATUS DCD_GetObjects(IN struct DCD_MANAGER *hDcdMgr, IN char *pszCoffPath, status = COD_Open(pDcdMgr->hCodMgr, pszCoffPath, COD_NOLOAD, &lib); if (DSP_FAILED(status)) { status = DSP_EDCDLOADBASE; - GT_0trace(curTrace, GT_6CLASS, - "DCD_AutoRegister: COD_Open() failed\n"); goto func_cont; } @@ -580,9 +543,6 @@ DSP_STATUS DCD_GetObjects(IN struct DCD_MANAGER *hDcdMgr, IN char *pszCoffPath, status = COD_GetSection(lib, DCD_REGISTER_SECTION, &ulAddr, &ulLen); if (DSP_FAILED(status) || !(ulLen > 0)) { status = DSP_EDCDNOAUTOREGISTER; - GT_0trace(curTrace, GT_6CLASS, - "DCD_GetObjects: COD_GetSection() " - "- no auto register section\n"); goto func_cont; } @@ -633,17 +593,12 @@ DSP_STATUS DCD_GetObjects(IN struct DCD_MANAGER *hDcdMgr, IN char *pszCoffPath, */ status = registerFxn(&dspUuid, cObjectType, handle); if (DSP_FAILED(status)) { - GT_0trace(curTrace, GT_6CLASS, - "DCD_GetObjects: " - "registration() failed\n"); /* if error occurs, break from while loop. */ break; } } } else { status = DSP_EDCDREADSECT; - GT_0trace(curTrace, GT_6CLASS, "DCD_GetObjects: " - "COD_ReadSection() failed\n"); } /* Free the previously allocated dynamic buffer. */ @@ -788,7 +743,6 @@ bool DCD_Init(void) if (!fInitCOD) { fInit = false; - GT_0trace(curTrace, GT_6CLASS, "DCD_Init failed\n"); /* Exit initialized modules. */ if (fInitCOD) COD_Exit(); @@ -881,15 +835,9 @@ DSP_STATUS DCD_RegisterObject(IN struct DSP_UUID *pUuid, GT_2trace(curTrace, GT_6CLASS, "REG_SetValue " "(u8 *)pszPathName=%s, dwPathSize=%d\n", pszPathName, dwPathSize); - if (DSP_FAILED(status)) - GT_0trace(curTrace, GT_6CLASS, - "DCD_RegisterObject: REG_SetValue failed!\n"); } else { /* Deregister an existing object */ status = REG_DeleteValue(szRegKey); - if (DSP_FAILED(status)) - GT_0trace(curTrace, GT_6CLASS, "DCD_UnregisterObject: " - "REG_DeleteValue failed!\n"); } diff --git a/drivers/dsp/bridge/rmgr/disp.c b/drivers/dsp/bridge/rmgr/disp.c index 4d7a2da..795856b 100644 --- a/drivers/dsp/bridge/rmgr/disp.c +++ b/drivers/dsp/bridge/rmgr/disp.c @@ -117,13 +117,10 @@ DSP_STATUS DISP_Create(OUT struct DISP_OBJECT **phDispObject, /* Allocate Node Dispatcher object */ MEM_AllocObject(pDisp, struct DISP_OBJECT, DISP_SIGNATURE); - if (pDisp == NULL) { + if (pDisp == NULL) status = DSP_EMEMORY; - GT_0trace(DISP_DebugMask, GT_6CLASS, - "DISP_Create: MEM_AllocObject() failed!\n"); - } else { + else pDisp->hDevObject = hDevObject; - } /* Get Channel manager and WMD function interface */ if (DSP_SUCCEEDED(status)) { @@ -131,10 +128,6 @@ DSP_STATUS DISP_Create(OUT struct DISP_OBJECT **phDispObject, if (DSP_SUCCEEDED(status)) { (void) DEV_GetIntfFxns(hDevObject, &pIntfFxns); pDisp->pIntfFxns = pIntfFxns; - } else { - GT_1trace(DISP_DebugMask, GT_6CLASS, - "DISP_Create: Failed to get " - "channel manager! status = 0x%x\n", status); } } @@ -149,9 +142,6 @@ DSP_STATUS DISP_Create(OUT struct DISP_OBJECT **phDispObject, goto func_cont; if (devType != DSP_UNIT) { - GT_0trace(DISP_DebugMask, GT_6CLASS, - "DISP_Create: Unkown device " - "type in Device object !! \n"); status = DSP_EFAIL; goto func_cont; } @@ -165,35 +155,20 @@ DSP_STATUS DISP_Create(OUT struct DISP_OBJECT **phDispObject, ulChnlId = pDispAttrs->ulChnlOffset + CHNLTORMSOFFSET; status = (*pIntfFxns->pfnChnlOpen)(&(pDisp->hChnlToDsp), pDisp->hChnlMgr, CHNL_MODETODSP, ulChnlId, &chnlAttrs); - if (DSP_FAILED(status)) - GT_2trace(DISP_DebugMask, GT_6CLASS, - "DISP_Create: Channel to RMS " - "open failed, chnl id = %d, status = 0x%x\n", - ulChnlId, status); if (DSP_SUCCEEDED(status)) { ulChnlId = pDispAttrs->ulChnlOffset + CHNLFROMRMSOFFSET; status = (*pIntfFxns->pfnChnlOpen)(&(pDisp->hChnlFromDsp), pDisp->hChnlMgr, CHNL_MODEFROMDSP, ulChnlId, &chnlAttrs); - if (DSP_FAILED(status)) { - GT_2trace(DISP_DebugMask, GT_6CLASS, - "DISP_Create: Channel from RMS " - "open failed, chnl id = %d, status = 0x%x\n", - ulChnlId, status); - } } if (DSP_SUCCEEDED(status)) { /* Allocate buffer for commands, replies */ pDisp->ulBufsize = pDispAttrs->ulChnlBufSize; pDisp->ulBufsizeRMS = RMS_COMMANDBUFSIZE; pDisp->pBuf = MEM_Calloc(pDisp->ulBufsize, MEM_PAGED); - if (pDisp->pBuf == NULL) { + if (pDisp->pBuf == NULL) status = DSP_EMEMORY; - GT_0trace(DISP_DebugMask, GT_6CLASS, - "DISP_Create: Failed " - "to allocate channel buffer!\n"); - } } func_cont: if (DSP_SUCCEEDED(status)) @@ -280,11 +255,7 @@ DSP_STATUS DISP_NodeChangePriority(struct DISP_OBJECT *hDisp, pCommand->arg2 = nPriority; status = SendMessage(hDisp, NODE_GetTimeout(hNode), sizeof(struct RMS_Command), &dwArg); - if (DSP_FAILED(status)) { - GT_1trace(DISP_DebugMask, GT_6CLASS, - "DISP_NodeChangePriority failed! " - "status = 0x%x\n", status); - } + return status; } @@ -489,19 +460,9 @@ DSP_STATUS DISP_NodeCreate(struct DISP_OBJECT *hDisp, struct NODE_OBJECT *hNode, strmDef, max, uCharsInRMSWord); offset = total; } - if (DSP_FAILED(status)) { - GT_2trace(DISP_DebugMask, GT_6CLASS, - "DISP_NodeCreate: Message" - " args to large for buffer! Message args" - " size = %d, max = %d\n", total, max); - } } else { /* Args won't fit */ status = DSP_EFAIL; - GT_2trace(DISP_DebugMask, GT_6CLASS, - "DISP_NodeCreate: Message args " - " too large for buffer! Message args size = %d" - ", max = %d\n", total, max); } } if (DSP_SUCCEEDED(status)) { @@ -509,11 +470,7 @@ DSP_STATUS DISP_NodeCreate(struct DISP_OBJECT *hDisp, struct NODE_OBJECT *hNode, DBC_Assert(ulBytes < (RMS_COMMANDBUFSIZE * sizeof(RMS_WORD))); status = SendMessage(hDisp, NODE_GetTimeout(hNode), ulBytes, pNodeEnv); - if (DSP_FAILED(status)) { - GT_1trace(DISP_DebugMask, GT_6CLASS, - "DISP_NodeCreate failed! " - "status = 0x%x\n", status); - } else { + if (DSP_SUCCEEDED(status)) { /* * Message successfully received from RMS. * Return the status of the Node's create function @@ -568,11 +525,7 @@ DSP_STATUS DISP_NodeDelete(struct DISP_OBJECT *hDisp, struct NODE_OBJECT *hNode, status = SendMessage(hDisp, NODE_GetTimeout(hNode), sizeof(struct RMS_Command), &dwArg); - if (DSP_FAILED(status)) { - GT_1trace(DISP_DebugMask, GT_6CLASS, - "DISP_NodeDelete failed!" - "status = 0x%x\n", status); - } else { + if (DSP_SUCCEEDED(status)) { /* * Message successfully received from RMS. * Return the status of the Node's delete @@ -627,11 +580,7 @@ DSP_STATUS DISP_NodeRun(struct DISP_OBJECT *hDisp, struct NODE_OBJECT *hNode, status = SendMessage(hDisp, NODE_GetTimeout(hNode), sizeof(struct RMS_Command), &dwArg); - if (DSP_FAILED(status)) { - GT_1trace(DISP_DebugMask, GT_6CLASS, - "DISP_NodeRun failed!" - "status = 0x%x\n", status); - } else { + if (DSP_SUCCEEDED(status)) { /* * Message successfully received from RMS. * Return the status of the Node's execute @@ -773,30 +722,17 @@ static DSP_STATUS SendMessage(struct DISP_OBJECT *hDisp, u32 dwTimeout, /* Send the command */ status = (*pIntfFxns->pfnChnlAddIOReq) (hChnl, pBuf, ulBytes, 0, 0L, dwArg); - - if (DSP_FAILED(status)) { - GT_1trace(DISP_DebugMask, GT_6CLASS, - "SendMessage: Channel AddIOReq to" - " RMS failed! Status = 0x%x\n", status); + if (DSP_FAILED(status)) goto func_end; - } + status = (*pIntfFxns->pfnChnlGetIOC) (hChnl, dwTimeout, &chnlIOC); if (DSP_SUCCEEDED(status)) { if (!CHNL_IsIOComplete(chnlIOC)) { - if (CHNL_IsTimedOut(chnlIOC)) { + if (CHNL_IsTimedOut(chnlIOC)) status = DSP_ETIMEOUT; - } else { - GT_1trace(DISP_DebugMask, GT_6CLASS, - "SendMessage failed! " - "Channel IOC status = 0x%x\n", - chnlIOC.status); + else status = DSP_EFAIL; - } } - } else { - GT_1trace(DISP_DebugMask, GT_6CLASS, - "SendMessage: Channel GetIOC to" - " RMS failed! Status = 0x%x\n", status); } /* Get the reply */ if (DSP_FAILED(status)) @@ -806,22 +742,15 @@ static DSP_STATUS SendMessage(struct DISP_OBJECT *hDisp, u32 dwTimeout, ulBytes = REPLYSIZE; status = (*pIntfFxns->pfnChnlAddIOReq)(hChnl, pBuf, ulBytes, 0, 0L, dwArg); - if (DSP_FAILED(status)) { - GT_1trace(DISP_DebugMask, GT_6CLASS, - "SendMessage: Channel AddIOReq " - "from RMS failed! Status = 0x%x\n", status); + if (DSP_FAILED(status)) goto func_end; - } + status = (*pIntfFxns->pfnChnlGetIOC) (hChnl, dwTimeout, &chnlIOC); if (DSP_SUCCEEDED(status)) { if (CHNL_IsTimedOut(chnlIOC)) { status = DSP_ETIMEOUT; } else if (chnlIOC.cBytes < ulBytes) { /* Did not get all of the reply from the RMS */ - GT_1trace(DISP_DebugMask, GT_6CLASS, - "SendMessage: Did not get all" - "of reply from RMS! Bytes received: %d\n", - chnlIOC.cBytes); status = DSP_EFAIL; } else { if (CHNL_IsIOComplete(chnlIOC)) { @@ -832,11 +761,6 @@ static DSP_STATUS SendMessage(struct DISP_OBJECT *hDisp, u32 dwTimeout, status = DSP_EFAIL; } } - } else { - /* GetIOC failed */ - GT_1trace(DISP_DebugMask, GT_6CLASS, - "SendMessage: Failed to get " - "reply from RMS! Status = 0x%x\n", status); } func_end: return status; diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c index dbe1581..c334f9e 100644 --- a/drivers/dsp/bridge/rmgr/drv.c +++ b/drivers/dsp/bridge/rmgr/drv.c @@ -538,8 +538,6 @@ DSP_STATUS DRV_Create(OUT struct DRV_OBJECT **phDRVObject) LST_LIST), MEM_NONPAGED); if (!(pDRVObject->devNodeString)) { status = DSP_EFAIL; - GT_0trace(curTrace, GT_7CLASS, - "Failed to Create DRV_EXT list "); } else { INIT_LIST_HEAD(&pDRVObject->devNodeString-> head); @@ -547,13 +545,9 @@ DSP_STATUS DRV_Create(OUT struct DRV_OBJECT **phDRVObject) } } else { status = DSP_EMEMORY; - GT_0trace(curTrace, GT_7CLASS, - "Failed to Create Dev List "); } } else { status = DSP_EMEMORY; - GT_0trace(curTrace, GT_7CLASS, - "Failed to Allocate Memory for DRV Obj"); } /* Store the DRV Object in the Registry */ if (DSP_SUCCEEDED(status)) @@ -565,10 +559,6 @@ DSP_STATUS DRV_Create(OUT struct DRV_OBJECT **phDRVObject) kfree(pDRVObject->devNodeString); /* Free the DRV Object */ kfree(pDRVObject); - GT_0trace(curTrace, GT_7CLASS, - "Failed to update the Registry with " - "DRV Object "); - } DBC_Ensure(DSP_FAILED(status) || @@ -647,8 +637,6 @@ DSP_STATUS DRV_GetDevObject(u32 uIndex, struct DRV_OBJECT *hDrvObject, } else { *phDevObject = NULL; status = DSP_EFAIL; - GT_0trace(curTrace, GT_7CLASS, - "DRV: Could not get the DevObject\n"); } return status; @@ -869,8 +857,6 @@ DSP_STATUS DRV_RequestResources(u32 dwContext, u32 *pDevNodeString) LST_PutTail(pDRVObject->devNodeString, (struct list_head *)pszdevNode); } else { - GT_0trace(curTrace, GT_7CLASS, - "Failed to Allocate Memory devNodeString "); status = DSP_EMEMORY; *pDevNodeString = 0; } @@ -974,8 +960,6 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest) if (DSP_FAILED(REG_GetValue(CURRENTCONFIG, (u8 *)pResources, &dwBuffSize))) { status = CFG_E_RESOURCENOTAVAIL; - GT_0trace(curTrace, GT_1CLASS, - "REG_GetValue Failed \n"); } dwBuffSize = sizeof(shm_size); diff --git a/drivers/dsp/bridge/rmgr/dspdrv.c b/drivers/dsp/bridge/rmgr/dspdrv.c index dae61e2..b6a9bc4 100644 --- a/drivers/dsp/bridge/rmgr/dspdrv.c +++ b/drivers/dsp/bridge/rmgr/dspdrv.c @@ -61,13 +61,11 @@ u32 DSP_Init(OUT u32 *initStatus) GT_create(&curTrace, "DD"); - if (!WCD_Init()) { - GT_0trace(curTrace, GT_7CLASS, "DSP_Init Failed \n"); + if (!WCD_Init()) goto func_cont; - } /* End WCD_Exit */ + status = DRV_Create(&drvObject); if (DSP_FAILED(status)) { - GT_0trace(curTrace, GT_7CLASS, "DSP_Init:DRV_Create Failed \n"); WCD_Exit(); goto func_cont; } /* End DRV_Create */ @@ -78,12 +76,9 @@ u32 DSP_Init(OUT u32 *initStatus) /* Attempt to Start the Device */ status = DEV_StartDevice((struct CFG_DEVNODE *) deviceNodeString); - if (DSP_FAILED(status)) { - GT_0trace(curTrace, GT_7CLASS, - "DSP_Init:DEV_StartDevice Failed\n"); + if (DSP_FAILED(status)) (void)DRV_ReleaseResources ((u32) deviceNodeString, drvObject); - } } else { GT_0trace(curTrace, GT_7CLASS, "DSP_Init:DRV_RequestResources Failed \r\n"); diff --git a/drivers/dsp/bridge/rmgr/mgr.c b/drivers/dsp/bridge/rmgr/mgr.c index d7118da..b905906 100644 --- a/drivers/dsp/bridge/rmgr/mgr.c +++ b/drivers/dsp/bridge/rmgr/mgr.c @@ -80,22 +80,15 @@ DSP_STATUS MGR_Create(OUT struct MGR_OBJECT **phMgrObject, if (DSP_SUCCEEDED(status)) { *phMgrObject = pMgrObject; } else { - GT_0trace(MGR_DebugMask, GT_7CLASS, - "MGR_Create:CFG_SetObject " - "Failed\r\n"); DCD_DestroyManager(pMgrObject->hDcdMgr); MEM_FreeObject(pMgrObject); } } else { /* failed to Create DCD Manager */ - GT_0trace(MGR_DebugMask, GT_7CLASS, - "MGR_Create:DCD_ManagerCreate Failed\r\n"); MEM_FreeObject(pMgrObject); } } else { status = DSP_EMEMORY; - GT_0trace(MGR_DebugMask, GT_7CLASS, - "MGR_Create DSP_FAILED to allocate memory \n"); } DBC_Ensure(DSP_FAILED(status) || @@ -152,12 +145,9 @@ DSP_STATUS MGR_EnumNodeInfo(u32 uNode, OUT struct DSP_NDBPROPS *pNDBProps, *puNumNodes = 0; /* Get The Manager Object from the Registry */ status = CFG_GetObject((u32 *)&pMgrObject, REG_MGR_OBJECT); - if (DSP_FAILED(status)) { - GT_0trace(MGR_DebugMask, GT_7CLASS, - "Manager_EnumNodeInfo:Failed To Get" - " MGR Object from Registry\r\n"); + if (DSP_FAILED(status)) goto func_cont; - } + DBC_Assert(MEM_IsValidHandle(pMgrObject, SIGNATURE)); /* Forever loop till we hit failed or no more items in the * Enumeration. We will exit the loop other than DSP_SOK; */ @@ -174,9 +164,6 @@ DSP_STATUS MGR_EnumNodeInfo(u32 uNode, OUT struct DSP_NDBPROPS *pNDBProps, if (DSP_SUCCEEDED(status)) { if (uNode > (uNodeIndex - 1)) { status = DSP_EINVALIDARG; - GT_0trace(MGR_DebugMask, GT_7CLASS, - "Manager_EnumNodeInfo: uNode" - " is Invalid \r\n"); } else { status = DCD_GetObjectDef(pMgrObject->hDcdMgr, (struct DSP_UUID *)&Uuid, @@ -185,17 +172,10 @@ DSP_STATUS MGR_EnumNodeInfo(u32 uNode, OUT struct DSP_NDBPROPS *pNDBProps, /* Get the Obj def */ *pNDBProps = GenObj.objData.nodeObj.ndbProps; *puNumNodes = uNodeIndex; - } else { - GT_0trace(MGR_DebugMask, GT_7CLASS, - "Manager_EnumNodeInfo: " - "Failed to Get Node Info \r\n"); } } - } else { - /* This could be changed during enum, EFAIL ... */ - GT_0trace(MGR_DebugMask, GT_7CLASS, "Manager_EnumNodeInfo: " - "Enumeration failure\r\n"); } + func_cont: DBC_Ensure((DSP_SUCCEEDED(status) && *puNumNodes > 0) || (DSP_FAILED(status) && *puNumNodes == 0)); @@ -240,15 +220,12 @@ DSP_STATUS MGR_EnumProcessorInfo(u32 uProcessor, if (DSP_SUCCEEDED(status)) { status = DEV_GetDevType(hDevObject, (u32 *) &devType); status = DEV_GetDevNode(hDevObject, &devNode); - if (devType == DSP_UNIT) { + if (devType == DSP_UNIT) status = CFG_GetDSPResources(devNode, &chipResources); - } else { + else status = DSP_EFAIL; - GT_1trace(MGR_DebugMask, GT_7CLASS, - "Unsupported dev type gotten" - "from device object %d\n", devType); - } + if (DSP_SUCCEEDED(status)) { pProcessorInfo->uProcessorType = chipResources.uChipType; @@ -392,11 +369,8 @@ bool MGR_Init(void) GT_create(&MGR_DebugMask, "MG"); /* "MG" for Manager */ fInitDCD = DCD_Init(); /* DCD Module */ - if (!fInitDCD) { + if (!fInitDCD) fRetval = false; - GT_0trace(MGR_DebugMask, GT_6CLASS, - "MGR_Init failed\n"); - } } if (fRetval) diff --git a/drivers/dsp/bridge/rmgr/nldr.c b/drivers/dsp/bridge/rmgr/nldr.c index 71487be..e964d4b 100644 --- a/drivers/dsp/bridge/rmgr/nldr.c +++ b/drivers/dsp/bridge/rmgr/nldr.c @@ -353,8 +353,6 @@ DSP_STATUS NLDR_Allocate(struct NLDR_OBJECT *hNldr, void *pPrivRef, MEM_AllocObject(pNldrNode, struct NLDR_NODEOBJECT, NLDR_NODESIGNATURE); if (pNldrNode == NULL) { - GT_0trace(NLDR_debugMask, GT_6CLASS, "NLDR_Allocate: " - "Memory allocation failed\n"); status = DSP_EMEMORY; } else { pNldrNode->pfPhaseSplit = pfPhaseSplit; @@ -491,8 +489,6 @@ DSP_STATUS NLDR_Create(OUT struct NLDR_OBJECT **phNldr, status = DSP_EMEMORY; } else { - GT_0trace(NLDR_debugMask, GT_6CLASS, "NLDR_Create: " - "Memory allocation failed\n"); status = DSP_EMEMORY; } /* Create the DCD Manager */ @@ -507,9 +503,6 @@ DSP_STATUS NLDR_Create(OUT struct NLDR_OBJECT **phNldr, pszCoffBuf = MEM_Calloc(ulLen * pNldr->usDSPMauSize, MEM_PAGED); if (!pszCoffBuf) { - GT_0trace(NLDR_debugMask, GT_6CLASS, - "NLDR_Create: Memory " - "allocation failed\n"); status = DSP_EMEMORY; } } else { @@ -526,21 +519,12 @@ DSP_STATUS NLDR_Create(OUT struct NLDR_OBJECT **phNldr, /* Read section containing dynamic load mem segments */ status = pNldr->dbllFxns.readSectFxn(pNldr->baseLib, DYNMEMSECT, pszCoffBuf, ulLen); - if (DSP_FAILED(status)) { - GT_1trace(NLDR_debugMask, GT_6CLASS, - "NLDR_Create: DBLL_read Section" - "failed: 0x%lx\n", status); - } } if (DSP_SUCCEEDED(status) && ulLen > 0) { /* Parse memory segment data */ nSegs = (u16)(*((u32 *)pszCoffBuf)); - if (nSegs > MAXMEMSEGS) { - GT_1trace(NLDR_debugMask, GT_6CLASS, - "NLDR_Create: Invalid number of " - "dynamic load mem segments: 0x%lx\n", nSegs); + if (nSegs > MAXMEMSEGS) status = DSP_ECORRUPTFILE; - } } /* Parse dynamic load memory segments */ if (DSP_SUCCEEDED(status) && nSegs > 0) { @@ -780,14 +764,10 @@ DSP_STATUS NLDR_GetFxnAddr(struct NLDR_NODEOBJECT *hNldrNode, char *pstrFxn, } } - if (status1) { + if (status1) *pulAddr = pSym->value; - } else { - GT_1trace(NLDR_debugMask, GT_6CLASS, - "NLDR_GetFxnAddr: Symbol not found: " - "%s\n", pstrFxn); + else status = DSP_ESYMBOL; - } return status; } @@ -808,8 +788,6 @@ DSP_STATUS NLDR_GetRmmManager(struct NLDR_OBJECT *hNldrObject, } else { *phRmmMgr = NULL; status = DSP_EHANDLE; - GT_0trace(NLDR_debugMask, GT_7CLASS, - "NLDR_GetRmmManager:Invalid handle"); } DBC_Ensure(DSP_SUCCEEDED(status) || ((phRmmMgr != NULL) && diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c index 78770fc..fe7d806 100644 --- a/drivers/dsp/bridge/rmgr/node.c +++ b/drivers/dsp/bridge/rmgr/node.c @@ -291,11 +291,9 @@ static struct NLDR_FXNS nldrFxns = { enum NODE_STATE NODE_GetState(HANDLE hNode) { struct NODE_OBJECT *pNode = (struct NODE_OBJECT *)hNode; - if (!MEM_IsValidHandle(pNode, NODE_SIGNATURE)) { - GT_1trace(NODE_debugMask, GT_5CLASS, - "NODE_GetState:hNode 0x%x\n", pNode); + if (!MEM_IsValidHandle(pNode, NODE_SIGNATURE)) return -1; - } else + else return pNode->nState; } @@ -373,9 +371,6 @@ DSP_STATUS NODE_Allocate(struct PROC_OBJECT *hProcessor, /* If processor is in error state then don't attempt to send the message */ if (procStatus.iState == PROC_ERROR) { - GT_1trace(NODE_debugMask, GT_5CLASS, - "NODE_Allocate: proc Status 0x%x\n", - procStatus.iState); status = DSP_EFAIL; goto func_end; } @@ -540,21 +535,11 @@ func_cont: if (DSP_SUCCEEDED(status)) { /*Get the shared mem mgr for this nodes dev object */ status = CMM_GetHandle(hProcessor, &hCmmMgr); - if (DSP_FAILED(status)) { - GT_1trace(NODE_debugMask, GT_5CLASS, - "NODE_Allocate: Failed to" - " get CMM Mgr handle: 0x%x\n", status); - } else { + if (DSP_SUCCEEDED(status)) { /* Allocate a SM addr translator for this node * w/ deflt attr */ status = CMM_XlatorCreate(&pNode->hXlator, hCmmMgr, NULL); - if (DSP_FAILED(status)) { - GT_1trace(NODE_debugMask, GT_5CLASS, - "NODE_Allocate: Failed to " - "create SM translator: 0x%x\n", - status); - } } } if (DSP_SUCCEEDED(status)) { @@ -591,11 +576,6 @@ func_cont: &pNode->dcdProps.objData.nodeObj, &pNode->hNldrNode, &pNode->fPhaseSplit); - if (DSP_FAILED(status)) { - GT_1trace(NODE_debugMask, GT_5CLASS, - "NODE_Allocate: Failed to " - "allocate NLDR node: 0x%x\n", status); - } } /* Compare value read from Node Properties and check if it is same as @@ -748,11 +728,6 @@ DBAPI NODE_AllocMsgBuf(struct NODE_OBJECT *hNode, u32 uSize, /* Set/get this node's translators virtual address base/size */ status = CMM_XlatorInfo(pNode->hXlator, pBuffer, uSize, pAttr->uSegment, bSetInfo); - if (DSP_FAILED(status)) { - GT_1trace(NODE_debugMask, GT_7CLASS, - "NODE_AllocMsgBuf " - "failed: 0x%lx\n", status); - } } if (DSP_SUCCEEDED(status) && (!bVirtAddr)) { if (pAttr->uSegment != 1) { @@ -808,8 +783,6 @@ DSP_STATUS NODE_ChangePriority(struct NODE_OBJECT *hNode, s32 nPriority) DBC_Require(cRefs > 0); if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE) || !hNode->hNodeMgr) { - GT_1trace(NODE_debugMask, GT_7CLASS, - "Invalid NODE Handle: 0x%x\n", hNode); status = DSP_EHANDLE; } else { hNodeMgr = hNode->hNodeMgr; @@ -1196,8 +1169,6 @@ DSP_STATUS NODE_Create(struct NODE_OBJECT *hNode) /* If processor is in error state then don't attempt to create new node */ if (procStatus.iState == PROC_ERROR) { - GT_1trace(NODE_debugMask, GT_4CLASS, "NODE_Create:" - " proc Status 0x%x\n", procStatus.iState); status = DSP_EFAIL; goto func_end; } @@ -1351,17 +1322,12 @@ DSP_STATUS NODE_CreateMgr(OUT struct NODE_MGR **phNodeMgr, if (pNodeMgr->nodeList == NULL || pNodeMgr->pipeMap == NULL || pNodeMgr->pipeDoneMap == NULL) { status = DSP_EMEMORY; - GT_0trace(NODE_debugMask, GT_6CLASS, - "NODE_CreateMgr: Memory " - "allocation failed\n"); } else { INIT_LIST_HEAD(&pNodeMgr->nodeList->head); status = NTFY_Create(&pNodeMgr->hNtfy); } pNodeMgr->uNumCreated = 0; } else { - GT_0trace(NODE_debugMask, GT_6CLASS, - "NODE_CreateMgr: Memory allocation failed\n"); status = DSP_EMEMORY; } /* get devNodeType */ @@ -1417,11 +1383,6 @@ DSP_STATUS NODE_CreateMgr(OUT struct NODE_MGR **phNodeMgr, if (devType != IVA_UNIT) { /* Get addresses of any RMS functions loaded */ status = GetRMSFxns(pNodeMgr); - if (DSP_FAILED(status)) { - GT_1trace(NODE_debugMask, GT_6CLASS, - "NODE_CreateMgr: Failed to" - " get RMS functions: status = 0x%x", status); - } } } @@ -1437,11 +1398,6 @@ DSP_STATUS NODE_CreateMgr(OUT struct NODE_MGR **phNodeMgr, pNodeMgr->fLoaderInit = pNodeMgr->nldrFxns.pfnInit(); status = pNodeMgr->nldrFxns.pfnCreate(&pNodeMgr->hNldr, hDevObject, &nldrAttrs); - if (DSP_FAILED(status)) { - GT_1trace(NODE_debugMask, GT_6CLASS, - "NODE_CreateMgr: Failed to " - "create loader: status = 0x%x\n", status); - } } if (DSP_SUCCEEDED(status)) *phNodeMgr = pNodeMgr; @@ -1857,8 +1813,6 @@ DSP_STATUS NODE_GetMessage(struct NODE_OBJECT *hNode, OUT struct DSP_MSG *pMsg, /* If processor is in error state then don't attempt to get the message */ if (procStatus.iState == PROC_ERROR) { - GT_1trace(NODE_debugMask, GT_4CLASS, "NODE_GetMessage:" - " proc Status 0x%x\n", procStatus.iState); status = DSP_EFAIL; goto func_end; } @@ -1893,13 +1847,9 @@ DSP_STATUS NODE_GetMessage(struct NODE_OBJECT *hNode, OUT struct DSP_MSG *pMsg, pMsg->dwArg1 = (u32) pTmpBuf; pMsg->dwArg2 *= hNode->hNodeMgr->uDSPWordSize; } else { - GT_0trace(NODE_debugMask, GT_7CLASS, "NODE_GetMessage: " - "Failed SM translation!\n"); status = DSP_ETRANSLATE; } } else { - GT_0trace(NODE_debugMask, GT_7CLASS, "NODE_GetMessage: Failed " - "SM Pa/Pa translation!\n"); status = DSP_ETRANSLATE; } func_end: @@ -2103,9 +2053,6 @@ DSP_STATUS NODE_Pause(struct NODE_OBJECT *hNode) /* If processor is in error state then don't attempt to send the message */ if (procStatus.iState == PROC_ERROR) { - GT_1trace(NODE_debugMask, GT_4CLASS, - "NODE_Pause: proc Status 0x%x\n", - procStatus.iState); status = DSP_EFAIL; goto func_cont; } @@ -2117,13 +2064,8 @@ DSP_STATUS NODE_Pause(struct NODE_OBJECT *hNode) } /* Update state */ - if (DSP_SUCCEEDED(status)) { + if (DSP_SUCCEEDED(status)) NODE_SetState(hNode, NODE_PAUSED); - } else { - GT_1trace(NODE_debugMask, GT_6CLASS, - "NODE_Pause: Failed. hNode:" - " 0x%x\n", hNode); - } } func_cont: /* End of SYNC_EnterCS */ @@ -2176,8 +2118,6 @@ DSP_STATUS NODE_PutMessage(struct NODE_OBJECT *hNode, /* If processor is in bad state then don't attempt sending the message */ if (procStatus.iState == PROC_ERROR) { - GT_1trace(NODE_debugMask, GT_4CLASS, "NODE_PutMessage:" - " proc Status 0x%x\n", procStatus.iState); status = DSP_EFAIL; goto func_end; } @@ -2230,9 +2170,6 @@ DSP_STATUS NODE_PutMessage(struct NODE_OBJECT *hNode, status = DSP_EFAIL; /* bad DSPWordSize */ } } else { /* failed to translate buffer address */ - GT_0trace(NODE_debugMask, GT_7CLASS, - "NODE_PutMessage: Failed to" - " translate SM address\n"); status = DSP_ETRANSLATE; } } @@ -2334,8 +2271,6 @@ DSP_STATUS NODE_Run(struct NODE_OBJECT *hNode) goto func_end; /* If processor is in error state then don't attempt to run the node */ if (procStatus.iState == PROC_ERROR) { - GT_1trace(NODE_debugMask, GT_4CLASS, "NODE_Run:" - " proc Status 0x%x\n", procStatus.iState); status = DSP_EFAIL; goto func_end; } @@ -2453,9 +2388,7 @@ DSP_STATUS NODE_Terminate(struct NODE_OBJECT *hNode, OUT DSP_STATUS *pStatus) goto func_end; } if (pNode->hProcessor == NULL) { - GT_1trace(NODE_debugMask, GT_4CLASS, - "NODE_Terminate: pNode->hProcessor = 0x%x\n", - pNode->hProcessor); + status = DSP_EHANDLE; goto func_end; } status = PROC_GetProcessorId(pNode->hProcessor, &procId); @@ -2498,8 +2431,6 @@ DSP_STATUS NODE_Terminate(struct NODE_OBJECT *hNode, OUT DSP_STATUS *pStatus) /* If processor is in error state then don't attempt to send * A kill task command */ if (procStatus.iState == PROC_ERROR) { - GT_1trace(NODE_debugMask, GT_4CLASS, "NODE_Terminate:" - " proc Status 0x%x\n", procStatus.iState); status = DSP_EFAIL; goto func_cont; } @@ -2655,18 +2586,10 @@ static void DeleteNode(struct NODE_OBJECT *hNode, status = PROC_UnMap(hNode->hProcessor, (void *)taskArgs.uDSPHeapAddr, pr_ctxt); - if (DSP_FAILED(status)) - GT_1trace(NODE_debugMask, GT_5CLASS, - "DSPProcessor_UnMap failed." - " Status = 0x%x\n", (u32)status); status = PROC_UnReserveMemory(hNode->hProcessor, (void *)taskArgs.uDSPHeapResAddr); - if (DSP_FAILED(status)) - GT_1trace(NODE_debugMask, GT_5CLASS, - "DSPProcessor_UnReserveMemory " - "failed. Status = 0x%x\n", - (u32)status); + #ifdef DSP_DMM_DEBUG status = DMM_GetHandle(pProcObject, &hDmmMgr); if (DSP_SUCCEEDED(status)) @@ -3119,9 +3042,6 @@ DSP_STATUS NODE_GetUUIDProps(DSP_HPROCESSOR hProcessor, /* If processor is in error state then don't attempt to send the message */ if (procStatus.iState == PROC_ERROR) { - GT_1trace(NODE_debugMask, GT_5CLASS, - "NODE_GetUUIDProps: proc Status 0x%x\n", - procStatus.iState); status = DSP_EFAIL; goto func_end; } diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c index f451244..ed42a47 100644 --- a/drivers/dsp/bridge/rmgr/proc.c +++ b/drivers/dsp/bridge/rmgr/proc.c @@ -136,37 +136,16 @@ PROC_Attach(u32 uProcessor, OPTIONAL CONST struct DSP_PROCESSORATTRIN *pAttrIn, /* Get the Driver and Manager Object Handles */ status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT); - if (DSP_SUCCEEDED(status)) { + if (DSP_SUCCEEDED(status)) status = CFG_GetObject((u32 *)&hMgrObject, REG_MGR_OBJECT); - if (DSP_FAILED(status)) { - /* don't propogate CFG errors from this PROC function */ - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Attach: DSP_FAILED to get" - "the Manager Object.\n", status); - } - } else { - /* don't propogate CFG errors from this PROC function */ - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Attach: failed to get the" - " DriverObject, 0x%x!\n", status); - } + if (DSP_SUCCEEDED(status)) { /* Get the Device Object */ status = DRV_GetDevObject(uProcessor, hDrvObject, &hDevObject); - if (DSP_FAILED(status)) { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Attach: failed to get" - " DevObject, 0x%x!\n", status); - } } - if (DSP_SUCCEEDED(status)) { + if (DSP_SUCCEEDED(status)) status = DEV_GetDevType(hDevObject, &devType); - if (DSP_FAILED(status)) { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Attach: failed to get" - " DevType, 0x%x!\n", status); - } - } + if (DSP_FAILED(status)) goto func_end; @@ -174,8 +153,6 @@ PROC_Attach(u32 uProcessor, OPTIONAL CONST struct DSP_PROCESSORATTRIN *pAttrIn, MEM_AllocObject(pProcObject, struct PROC_OBJECT, PROC_SIGNATURE); /* Fill out the Processor Object: */ if (pProcObject == NULL) { - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Attach:Out of memeory \n"); status = DSP_EMEMORY; goto func_end; } @@ -196,18 +173,11 @@ PROC_Attach(u32 uProcessor, OPTIONAL CONST struct DSP_PROCESSORATTRIN *pAttrIn, if (DSP_SUCCEEDED(status)) { status = DEV_GetWMDContext(hDevObject, &pProcObject->hWmdContext); - if (DSP_FAILED(status)) { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Attach Could not" - " get the WMD Context.\n", status); + if (DSP_FAILED(status)) MEM_FreeObject(pProcObject); - } - } else { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Attach Could not get" - " the DEV_ Interface fxns.\n", status); + } else MEM_FreeObject(pProcObject); - } + if (DSP_FAILED(status)) goto func_end; @@ -233,9 +203,6 @@ PROC_Attach(u32 uProcessor, OPTIONAL CONST struct DSP_PROCESSORATTRIN *pAttrIn, NTFY_Delete(pProcObject->hNtfy); MEM_FreeObject(pProcObject); - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Attach: failed to insert " - "Proc Object into DEV, 0x%x!\n", status); } if (DSP_SUCCEEDED(status)) { *phProcessor = (DSP_HPROCESSOR)pProcObject; @@ -245,9 +212,6 @@ PROC_Attach(u32 uProcessor, OPTIONAL CONST struct DSP_PROCESSORATTRIN *pAttrIn, } } else { /* Don't leak memory if DSP_FAILED */ - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Attach: Could not allocate " - "storage for notification \n"); MEM_FreeObject(pProcObject); } func_end: @@ -312,17 +276,11 @@ DSP_STATUS PROC_AutoStart(struct CFG_DEVNODE *hDevNode, /* Create a Dummy PROC Object */ status = CFG_GetObject((u32 *)&hMgrObject, REG_MGR_OBJECT); - if (DSP_FAILED(status)) { - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_AutoStart: DSP_FAILED to " - "Get MGR Object\n"); + if (DSP_FAILED(status)) goto func_end; - } + MEM_AllocObject(pProcObject, struct PROC_OBJECT, PROC_SIGNATURE); if (pProcObject == NULL) { - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_AutoStart: DSP_FAILED " - "to Create a dummy Processor\n"); status = DSP_EMEMORY; goto func_end; } @@ -333,17 +291,11 @@ DSP_STATUS PROC_AutoStart(struct CFG_DEVNODE *hDevNode, if (DSP_SUCCEEDED(status)) { status = DEV_GetWMDContext(hDevObject, &pProcObject->hWmdContext); - if (DSP_FAILED(status)) { + if (DSP_FAILED(status)) MEM_FreeObject(hProcObject); - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_AutoStart: Failed " - "to get WMD Context \n"); - } + } else { MEM_FreeObject(hProcObject); - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_AutoStart: Failed to " - "get IntFxns \n"); } if (DSP_FAILED(status)) goto func_cont; @@ -357,9 +309,6 @@ DSP_STATUS PROC_AutoStart(struct CFG_DEVNODE *hDevNode, status = CFG_GetAutoStart(hDevNode, &dwAutoStart); if (DSP_FAILED(status) || !dwAutoStart) { status = DSP_EFAIL; - /* DSP_FAILED to Get s32 Fxn or Wmd Context */ - GT_0trace(PROC_DebugMask, GT_1CLASS, "PROC_AutoStart: " - "CFG_GetAutoStart DSP_FAILED \n"); goto func_cont; } /* Get the default executable for this board... */ @@ -372,20 +321,8 @@ DSP_STATUS PROC_AutoStart(struct CFG_DEVNODE *hDevNode, argv[1] = NULL; /* ...and try to load it: */ status = PROC_Load(hProcObject, 1, (CONST char **)argv, NULL); - if (DSP_SUCCEEDED(status)) { + if (DSP_SUCCEEDED(status)) status = PROC_Start(hProcObject); - if (DSP_FAILED(status)) { - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_AutoStart: DSP_FAILED To " - "Start \n"); - } - } else { - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_AutoStart: DSP_FAILED to Load\n"); - } - } else { - GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_AutoStart: " - "No Exec file found \n"); } func_cont: kfree(hProcObject->g_pszLastCoff); @@ -443,13 +380,9 @@ DSP_STATUS PROC_Ctrl(DSP_HPROCESSOR hProcessor, u32 dwCmd, status = DSP_SOK; } else { status = DSP_EFAIL; - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Ctrl: Failed \n"); } } else { status = DSP_EHANDLE; - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Ctrl: InValid Processor Handle \n"); } return status; @@ -487,8 +420,6 @@ DSP_STATUS PROC_Detach(struct PROCESS_CONTEXT *pr_ctxt) pr_ctxt->hProcessor = NULL; } else { status = DSP_EHANDLE; - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Detach: InValid Processor Handle \n"); } return status; @@ -525,8 +456,6 @@ DSP_STATUS PROC_EnumNodes(DSP_HPROCESSOR hProcessor, OUT DSP_HNODE *aNodeTab, } } else { status = DSP_EHANDLE; - GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_EnumNodes: " - "InValid Processor Handle \n"); } return status; @@ -615,8 +544,6 @@ static DSP_STATUS proc_memory_sync(DSP_HPROCESSOR hProcessor, void *pMpuAddr, DBC_Require(cRefs > 0); if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "%s: InValid Processor Handle\n", __func__); status = DSP_EHANDLE; goto err_out; } @@ -684,9 +611,6 @@ DSP_STATUS PROC_GetResourceInfo(DSP_HPROCESSOR hProcessor, u32 uResourceType, if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_GetResourceInfo: InValid " - "Processor Handle \n"); goto func_end; } switch (uResourceType) { @@ -718,9 +642,6 @@ DSP_STATUS PROC_GetResourceInfo(DSP_HPROCESSOR hProcessor, u32 uResourceType, status = pProcObject->pIntfFxns->pfnIOGetProcLoad( hIOMgr, (struct DSP_PROCLOADSTAT *)& (pResourceInfo->result.procLoadStat)); - if (DSP_FAILED(status)) - GT_1trace(PROC_DebugMask, GT_7CLASS, - "Error in procLoadStat function 0x%x\n", status); break; default: status = DSP_EFAIL; @@ -820,30 +741,14 @@ DSP_STATUS PROC_GetState(DSP_HPROCESSOR hProcessor, status = DSP_EFAIL; break; } - } else { - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_GetState: General Failure" - " to read the PROC Status \n"); } /* Next, retrieve error information, if any */ status = DEV_GetDehMgr(pProcObject->hDevObject, &hDehMgr); - if (DSP_SUCCEEDED(status) && hDehMgr) { + if (DSP_SUCCEEDED(status) && hDehMgr) status = (*pProcObject->pIntfFxns->pfnDehGetInfo) (hDehMgr, &(pProcStatus->errInfo)); - if (DSP_FAILED(status)) { - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_GetState: Failed " - "retrieve exception info.\n"); - } - } else { - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_GetState: Failed to " - "retrieve DEH handle.\n"); - } } else { status = DSP_EHANDLE; - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_GetState:InValid Processor Handle \n"); } GT_2trace(PROC_DebugMask, GT_ENTER, "Exiting PROC_GetState, results:\n\t" @@ -947,33 +852,21 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc, /* Call the WMD_BRD_Load Fxn */ if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; - GT_0trace(PROC_DebugMask, GT_1CLASS, - "PROC_Load: Invalid Processor Handle..\n"); goto func_end; } if (DSP_FAILED(DEV_GetCodMgr(pProcObject->hDevObject, &hCodMgr))) { status = DSP_EFAIL; - GT_1trace(PROC_DebugMask, GT_7CLASS, "PROC_Load: DSP_FAILED in " - "DEV_GetCodMgr status 0x%x \n", status); goto func_end; } status = PROC_Stop(hProcessor); - if (DSP_FAILED(status)) { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Load: DSP_FAILED to Place the" - " Processor in Stop Mode(PROC_STOP) status 0x%x \n", - status); + if (DSP_FAILED(status)) goto func_end; - } + /* Place the board in the monitor state. */ status = PROC_Monitor(hProcessor); - if (DSP_FAILED(status)) { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Load: DSP_FAILED to Place the" - " Processor in Monitor Mode(PROC_IDLE) status 0x%x\n", - status); + if (DSP_FAILED(status)) goto func_end; - } + /* Save ptr to original argv[0]. */ pargv0 = (char *)aArgv[0]; /*Prepend "PROC_ID=<nProcID>"to envp array for target.*/ @@ -1013,15 +906,8 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc, /* On success, do COD_OpenBase() */ status = COD_OpenBase(hCodMgr, (char *)aArgv[0], COD_SYMB); - if (DSP_FAILED(status)) { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Load: COD_OpenBase " - "failed (0x%x)\n", status); - } } } else { - GT_0trace(PROC_DebugMask, GT_7CLASS, - " PROC_Load:Out of Memory \n"); status = DSP_EMEMORY; } if (DSP_SUCCEEDED(status)) { @@ -1036,17 +922,11 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc, * save the name of the COFF file for * de-registration in the future. */ status = DCD_AutoRegister(hDCDHandle, (char *)aArgv[0]); - if (status == DSP_EDCDNOAUTOREGISTER) { - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Load: No Auto " - "Register section. Proceeding..\n"); + if (status == DSP_EDCDNOAUTOREGISTER) status = DSP_SOK; - } + if (DSP_FAILED(status)) { status = DSP_EFAIL; - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Load: Failed to " - "Auto Register..\n"); } else { DBC_Assert(pProcObject->g_pszLastCoff == NULL); /* Allocate memory for pszLastCoff */ @@ -1079,16 +959,6 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc, status = DEV_GetIOMgr(pProcObject->hDevObject, &hIOMgr); DBC_Assert(DSP_SUCCEEDED(status)); status = (*pProcObject->pIntfFxns->pfnIOOnLoaded)(hIOMgr); - if (DSP_FAILED(status)) - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Load: Failed to get shared " - "memory or message buffer address " - "from COFF status 0x%x\n", status); - - } else { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Load: DSP_FAILED in " - "MSG_Create status 0x%x\n", status); } if (DSP_SUCCEEDED(status)) { /* Now, attempt to load an exec: */ @@ -1109,10 +979,6 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc, if (status == COD_E_SYMBOLNOTFOUND) { GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_Load:Could not parse the file\n"); - } else { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Load: DSP_FAILED in " - "COD_Load status 0x%x \n", status); } } /* Requesting the lowest opp supported*/ @@ -1131,10 +997,6 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc, if (pProcObject->hNtfy) PROC_NotifyClients(pProcObject, DSP_PROCESSORSTATECHANGE); - } else { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Load, pfnBrdSetState " - "failed: 0x%x\n", status); } } if (DSP_SUCCEEDED(status)) { @@ -1142,16 +1004,10 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc, if (uProcId == DSP_UNIT) { /* Use all available DSP address space after EXTMEM * for DMM */ - if (DSP_SUCCEEDED(status)) { + if (DSP_SUCCEEDED(status)) status = COD_GetSymValue(hCodMgr, EXTEND, &dwExtEnd); - if (DSP_FAILED(status)) { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Load: Failed on " - "COD_GetSymValue %s.\n", - EXTEND); - } - } + /* Reset DMM structs and add an initial free chunk*/ if (DSP_SUCCEEDED(status)) { status = DEV_GetDmmMgr(pProcObject->hDevObject, @@ -1236,20 +1092,14 @@ DSP_STATUS PROC_Map(DSP_HPROCESSOR hProcessor, void *pMpuAddr, u32 ulSize, if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; - GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_Map: " - "InValid Processor Handle \n"); goto func_end; } /* Critical section */ (void)SYNC_EnterCS(hProcLock); status = DMM_GetHandle(pProcObject, &hDmmMgr); - if (DSP_FAILED(status)) { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_Map: Failed to get DMM Mgr " - "handle: 0x%x\n", status); - } else { + if (DSP_SUCCEEDED(status)) status = DMM_MapMemory(hDmmMgr, vaAlign, sizeAlign); - } + /* Add mapping to the page tables. */ if (DSP_SUCCEEDED(status)) { @@ -1295,9 +1145,6 @@ DSP_STATUS PROC_RegisterNotify(DSP_HPROCESSOR hProcessor, u32 uEventMask, /* Check processor handle */ if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_RegsiterNotify Invalid " - "ProcessorHandle 0x%x\n", hProcessor); goto func_end; } /* Check if event mask is a valid processor related event */ @@ -1369,15 +1216,10 @@ DSP_STATUS PROC_ReserveMemory(DSP_HPROCESSOR hProcessor, u32 ulSize, ulSize, ppRsvAddr); if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; - GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_Map: " - "InValid Processor Handle \n"); goto func_end; } status = DMM_GetHandle(pProcObject, &hDmmMgr); - if (DSP_FAILED(status)) { - GT_1trace(PROC_DebugMask, GT_7CLASS, "PROC_ReserveMemory: " - "Failed to get DMM Mgr handle: 0x%x\n", status); - } else + if (DSP_SUCCEEDED(status)) status = DMM_ReserveMemory(hDmmMgr, ulSize, (u32 *)ppRsvAddr); GT_1trace(PROC_DebugMask, GT_ENTER, "Leaving PROC_ReserveMemory [0x%x]", @@ -1403,38 +1245,26 @@ DSP_STATUS PROC_Start(DSP_HPROCESSOR hProcessor) DBC_Require(cRefs > 0); if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Start :InValid Handle \n"); goto func_end; } /* Call the WMD_BRD_Start */ if (pProcObject->sState != PROC_LOADED) { - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Start :Wrong state \n"); status = DSP_EWRONGSTATE; goto func_end; } status = DEV_GetCodMgr(pProcObject->hDevObject, &hCodMgr); - if (DSP_FAILED(status)) { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "Processor Start DSP_FAILED " - "in Getting DEV_GetCodMgr status 0x%x\n", status); + if (DSP_FAILED(status)) goto func_cont; - } + status = COD_GetEntry(hCodMgr, &dwDspAddr); - if (DSP_FAILED(status)) { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "Processor Start DSP_FAILED in " - "Getting COD_GetEntry status 0x%x\n", status); + if (DSP_FAILED(status)) goto func_cont; - } + status = (*pProcObject->pIntfFxns->pfnBrdStart) (pProcObject->hWmdContext, dwDspAddr); - if (DSP_FAILED(status)) { - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Start Failed to Start the board\n"); + if (DSP_FAILED(status)) goto func_cont; - } + /* Call DEV_Create2 */ status = DEV_Create2(pProcObject->hDevObject); if (DSP_SUCCEEDED(status)) { @@ -1453,8 +1283,6 @@ DSP_STATUS PROC_Start(DSP_HPROCESSOR hProcessor) (void)(*pProcObject->pIntfFxns->pfnBrdStop)(pProcObject-> hWmdContext); pProcObject->sState = PROC_STOPPED; - GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_Start " - "Failed to Create the Node Manager\n"); } func_cont: #ifdef CONFIG_BRIDGE_DEBUG @@ -1493,8 +1321,6 @@ DSP_STATUS PROC_Stop(DSP_HPROCESSOR hProcessor) DBC_Require(cRefs > 0); if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Stop :InValid Handle \n"); goto func_end; } if (DSP_SUCCEEDED((*pProcObject->pIntfFxns->pfnBrdStatus) @@ -1537,9 +1363,6 @@ DSP_STATUS PROC_Stop(DSP_HPROCESSOR hProcessor) &uBrdState))) DBC_Assert(uBrdState == BRD_STOPPED); #endif - } else { - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Stop Couldn't delete node manager \n"); } } else { GT_0trace(PROC_DebugMask, GT_7CLASS, @@ -1573,17 +1396,12 @@ DSP_STATUS PROC_UnMap(DSP_HPROCESSOR hProcessor, void *pMapAddr, vaAlign = PG_ALIGN_LOW((u32) pMapAddr, PG_SIZE_4K); if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; - GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_UnMap: " - "InValid Processor Handle \n"); goto func_end; } status = DMM_GetHandle(hProcessor, &hDmmMgr); - if (DSP_FAILED(status)) { - GT_1trace(PROC_DebugMask, GT_7CLASS, "PROC_UnMap: " - "Failed to get DMM Mgr handle: 0x%x\n", status); + if (DSP_FAILED(status)) goto func_end; - } /* Critical section */ (void)SYNC_EnterCS(hProcLock); @@ -1626,16 +1444,10 @@ DSP_STATUS PROC_UnReserveMemory(DSP_HPROCESSOR hProcessor, void *pRsvAddr) "hProcessor: 0x%x pRsvAddr: 0x%x\n", hProcessor, pRsvAddr); if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; - GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_UnMap: " - "InValid Processor Handle \n"); goto func_end; } status = DMM_GetHandle(pProcObject, &hDmmMgr); - if (DSP_FAILED(status)) - GT_1trace(PROC_DebugMask, GT_7CLASS, - "PROC_UnReserveMemory: Failed to get DMM Mgr " - "handle: 0x%x\n", status); - else + if (DSP_SUCCEEDED(status)) status = DMM_UnReserveMemory(hDmmMgr, (u32) pRsvAddr); GT_1trace(PROC_DebugMask, GT_ENTER, @@ -1694,12 +1506,6 @@ static DSP_STATUS PROC_Monitor(struct PROC_OBJECT *hProcObject) (pProcObject->hWmdContext, &uBrdState))) DBC_Assert(uBrdState == BRD_IDLE); #endif - - } else { - /* Monitor Failure */ - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Monitor: Processor Could not" - "be put in Monitor mode \n"); } #ifdef CONFIG_BRIDGE_DEBUG @@ -1770,8 +1576,6 @@ DSP_STATUS PROC_NotifyClients(DSP_HPROCESSOR hProc, u32 uEvents) DBC_Require(cRefs > 0); if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; - GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_NotifyClients: " - "InValid Processor Handle \n"); goto func_end; } @@ -1796,8 +1600,6 @@ DSP_STATUS PROC_NotifyAllClients(DSP_HPROCESSOR hProc, u32 uEvents) if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) { status = DSP_EHANDLE; - GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_NotifyAllClients: " - "InValid Processor Handle \n"); goto func_end; } @@ -1819,11 +1621,9 @@ DSP_STATUS PROC_GetProcessorId(DSP_HPROCESSOR hProc, u32 *procID) if (MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) *procID = pProcObject->uProcessor; - else { + else status = DSP_EHANDLE; - GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_GetProcessorId: " - "InValid Processor Handle \n"); - } + return status; } diff --git a/drivers/dsp/bridge/rmgr/rmm.c b/drivers/dsp/bridge/rmgr/rmm.c index be8017f..8cf66ce 100644 --- a/drivers/dsp/bridge/rmgr/rmm.c +++ b/drivers/dsp/bridge/rmgr/rmm.c @@ -189,11 +189,9 @@ DSP_STATUS RMM_create(struct RMM_TargetObj **pTarget, /* Allocate DBL target object */ MEM_AllocObject(target, struct RMM_TargetObj, RMM_TARGSIGNATURE); - if (target == NULL) { - GT_0trace(RMM_debugMask, GT_6CLASS, - "RMM_create: Memory allocation failed\n"); + if (target == NULL) status = DSP_EMEMORY; - } + if (DSP_FAILED(status)) goto func_cont; @@ -205,8 +203,6 @@ DSP_STATUS RMM_create(struct RMM_TargetObj **pTarget, target->freeList = MEM_Calloc(numSegs * sizeof(struct RMM_Header *), MEM_PAGED); if (target->freeList == NULL) { - GT_0trace(RMM_debugMask, GT_6CLASS, - "RMM_create: Memory allocation failed\n"); status = DSP_EMEMORY; } else { /* Allocate headers for each element on the free list */ @@ -215,9 +211,6 @@ DSP_STATUS RMM_create(struct RMM_TargetObj **pTarget, MEM_Calloc(sizeof(struct RMM_Header), MEM_PAGED); if (target->freeList[i] == NULL) { - GT_0trace(RMM_debugMask, GT_6CLASS, - "RMM_create: Memory " - "allocation failed\n"); status = DSP_EMEMORY; break; } @@ -226,8 +219,6 @@ DSP_STATUS RMM_create(struct RMM_TargetObj **pTarget, target->segTab = MEM_Calloc(numSegs * sizeof(struct RMM_Segment), MEM_PAGED); if (target->segTab == NULL) { - GT_0trace(RMM_debugMask, GT_6CLASS, - "RMM_create: Memory allocation failed\n"); status = DSP_EMEMORY; } else { /* Initialize segment table and free list */ @@ -249,8 +240,6 @@ func_cont: target->ovlyList = MEM_Calloc(sizeof(struct LST_LIST), MEM_NONPAGED); if (target->ovlyList == NULL) { - GT_0trace(RMM_debugMask, GT_6CLASS, - "RMM_create: Memory allocation failed\n"); status = DSP_EMEMORY; } else { INIT_LIST_HEAD(&target->ovlyList->head); diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c index 5d74819..52b796f 100644 --- a/drivers/dsp/bridge/rmgr/strm.c +++ b/drivers/dsp/bridge/rmgr/strm.c @@ -136,9 +136,6 @@ DSP_STATUS STRM_AllocateBuffer(struct STRM_OBJECT *hStrm, u32 uSize, DBC_Assert(hStrm->hXlator != NULL); (void)CMM_XlatorAllocBuf(hStrm->hXlator, &apBuffer[i], uSize); if (apBuffer[i] == NULL) { - GT_0trace(STRM_debugMask, GT_7CLASS, - "STRM_AllocateBuffer: " - "DSP_FAILED to alloc shared memory.\n"); status = DSP_EMEMORY; uAllocated = i; break; @@ -221,23 +218,17 @@ DSP_STATUS STRM_Create(OUT struct STRM_MGR **phStrmMgr, struct DEV_OBJECT *hDev) *phStrmMgr = NULL; /* Allocate STRM manager object */ MEM_AllocObject(pStrmMgr, struct STRM_MGR, STRMMGR_SIGNATURE); - if (pStrmMgr == NULL) { + if (pStrmMgr == NULL) status = DSP_EMEMORY; - GT_0trace(STRM_debugMask, GT_6CLASS, "STRM_Create: " - "MEM_AllocObject() failed!\n "); - } else { + else pStrmMgr->hDev = hDev; - } + /* Get Channel manager and WMD function interface */ if (DSP_SUCCEEDED(status)) { status = DEV_GetChnlMgr(hDev, &(pStrmMgr->hChnlMgr)); if (DSP_SUCCEEDED(status)) { (void) DEV_GetIntfFxns(hDev, &(pStrmMgr->pIntfFxns)); DBC_Assert(pStrmMgr->pIntfFxns != NULL); - } else { - GT_1trace(STRM_debugMask, GT_6CLASS, "STRM_Create: " - "Failed to get channel manager! status = " - "0x%x\n", status); } } if (DSP_SUCCEEDED(status)) @@ -307,12 +298,8 @@ DSP_STATUS STRM_FreeBuffer(struct STRM_OBJECT *hStrm, u8 **apBuffer, for (i = 0; i < uNumBufs; i++) { DBC_Assert(hStrm->hXlator != NULL); status = CMM_XlatorFreeBuf(hStrm->hXlator, apBuffer[i]); - if (DSP_FAILED(status)) { - GT_0trace(STRM_debugMask, GT_7CLASS, - "STRM_FreeBuffer: DSP_FAILED" - " to free shared memory.\n"); + if (DSP_FAILED(status)) break; - } apBuffer[i] = NULL; } } @@ -524,8 +511,6 @@ DSP_STATUS STRM_Open(struct NODE_OBJECT *hNode, u32 uDir, u32 uIndex, MEM_AllocObject(pStrm, struct STRM_OBJECT, STRM_SIGNATURE); if (pStrm == NULL) { status = DSP_EMEMORY; - GT_0trace(STRM_debugMask, GT_6CLASS, - "STRM_Open: MEM_AllocObject() failed!\n "); } else { pStrm->hStrmMgr = hStrmMgr; pStrm->uDir = uDir; @@ -575,27 +560,15 @@ DSP_STATUS STRM_Open(struct NODE_OBJECT *hNode, u32 uDir, u32 uIndex, DBC_Assert(pStrm->lMode != STRMMODE_LDMA); /* no System DMA */ /* Get the shared mem mgr for this streams dev object */ status = DEV_GetCmmMgr(hStrmMgr->hDev, &hCmmMgr); - if (DSP_FAILED(status)) { - GT_1trace(STRM_debugMask, GT_6CLASS, "STRM_Open: Failed to get " - "CMM Mgr handle: 0x%x\n", status); - } else { + if (DSP_SUCCEEDED(status)) { /*Allocate a SM addr translator for this strm.*/ status = CMM_XlatorCreate(&pStrm->hXlator, hCmmMgr, NULL); - if (DSP_FAILED(status)) { - GT_1trace(STRM_debugMask, GT_6CLASS, - "STRM_Open: Failed to " - "create SM translator: 0x%x\n", status); - } else { + if (DSP_SUCCEEDED(status)) { DBC_Assert(pStrm->uSegment > 0); /* Set translators Virt Addr attributes */ status = CMM_XlatorInfo(pStrm->hXlator, (u8 **)&pAttr->pVirtBase, pAttr->ulVirtSize, pStrm->uSegment, true); - if (status != DSP_SOK) { - GT_0trace(STRM_debugMask, GT_6CLASS, - "STRM_Open: ERROR: " - "in setting CMM_XlatorInfo.\n"); - } } } func_cont: @@ -626,10 +599,6 @@ func_cont: status == CHNL_E_NOIORPS); status = DSP_EFAIL; } - GT_2trace(STRM_debugMask, GT_6CLASS, - "STRM_Open: Channel open failed, " - "chnl id = %d, status = 0x%x\n", ulChnlId, - status); } } if (DSP_SUCCEEDED(status)) @@ -679,11 +648,7 @@ DSP_STATUS STRM_Reclaim(struct STRM_OBJECT *hStrm, OUT u8 **pBufPtr, status = (*pIntfFxns->pfnChnlGetIOC)(hStrm->hChnl, hStrm->uTimeout, &chnlIOC); - if (DSP_FAILED(status)) { - GT_1trace(STRM_debugMask, GT_6CLASS, - "STRM_Reclaim: GetIOC failed! " - "Status = 0x%x\n", status); - } else { + if (DSP_SUCCEEDED(status)) { *pulBytes = chnlIOC.cBytes; if (pulBufSize) *pulBufSize = chnlIOC.cBufSize; @@ -716,12 +681,9 @@ DSP_STATUS STRM_Reclaim(struct STRM_OBJECT *hStrm, OUT u8 **pBufPtr, pTmpBuf = CMM_XlatorTranslate(hStrm->hXlator, pTmpBuf, CMM_PA2VA); } - if (pTmpBuf == NULL) { - GT_0trace(STRM_debugMask, GT_7CLASS, - "STRM_Reclaim: Failed " - "SM translation!\n"); + if (pTmpBuf == NULL) status = DSP_ETRANSLATE; - } + chnlIOC.pBuf = pTmpBuf; } *pBufPtr = chnlIOC.pBuf; -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 10/18] DSPBRIDGE: Remove excessive debug statements for wmd 2010-02-16 8:42 ` [PATCH 09/18] DSPBRIDGE: Remove excessive debug statements for rmgr Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 11/18] DSPBRIDGE: Remove excessive debug statements for pmgr Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna Removed debug statements that print redundant errors where returned statuses should be enough in case of failure. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/wmd/chnl_sm.c | 23 +-------- drivers/dsp/bridge/wmd/io_sm.c | 45 +----------------- drivers/dsp/bridge/wmd/tiomap3430.c | 77 +++++------------------------- drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 32 +------------ drivers/dsp/bridge/wmd/tiomap_io.c | 27 ++-------- drivers/dsp/bridge/wmd/ue_deh.c | 3 - 6 files changed, 26 insertions(+), 181 deletions(-) diff --git a/drivers/dsp/bridge/wmd/chnl_sm.c b/drivers/dsp/bridge/wmd/chnl_sm.c index 08bd09d..5020e37 100644 --- a/drivers/dsp/bridge/wmd/chnl_sm.c +++ b/drivers/dsp/bridge/wmd/chnl_sm.c @@ -142,18 +142,12 @@ DSP_STATUS WMD_CHNL_AddIOReq(struct CHNL_OBJECT *hChnl, void *pHostBuf, pHostSysBuf = MEM_Alloc(cBufSize, MEM_NONPAGED); if (pHostSysBuf == NULL) { status = DSP_EMEMORY; - DBG_Trace(DBG_LEVEL7, - "No memory to allocate kernel buffer\n"); goto func_end; } if (CHNL_IsOutput(pChnl->uMode)) { status = copy_from_user(pHostSysBuf, pHostBuf, cBufSize); if (status) { - DBG_Trace(DBG_LEVEL7, - "Error copying user buffer to " - "kernel, %d bytes remaining.\n", - status); kfree(pHostSysBuf); pHostSysBuf = NULL; status = DSP_EPOINTER; @@ -670,8 +664,6 @@ DSP_STATUS WMD_CHNL_GetIOC(struct CHNL_OBJECT *hChnl, u32 dwTimeOut, /* If the addr is in user mode, then copy it */ if (!pHostSysBuf || !ioc.pBuf) { status = DSP_EPOINTER; - DBG_Trace(DBG_LEVEL7, - "System buffer NULL in IO completion.\n"); goto func_cont; } if (!CHNL_IsInput(pChnl->uMode)) @@ -680,22 +672,11 @@ DSP_STATUS WMD_CHNL_GetIOC(struct CHNL_OBJECT *hChnl, u32 dwTimeOut, /*pHostUserBuf */ status = copy_to_user(ioc.pBuf, pHostSysBuf, ioc.cBytes); if (status) { - if (current->flags & PF_EXITING) { + if (current->flags & PF_EXITING) status = 0; - } else { - DBG_Trace(DBG_LEVEL7, - "\n2current->flags != PF_EXITING, " - " current->flags;0x%x\n", - current->flags); - } } - if (status) { - DBG_Trace(DBG_LEVEL7, - "Error copying kernel buffer to user, %d" - " bytes remaining. in_interupt %d\n", - status, in_interrupt()); + if (status) status = DSP_EPOINTER; - } func_cont1: kfree(pHostSysBuf); } diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c index 55ec6ef..ab7607f 100644 --- a/drivers/dsp/bridge/wmd/io_sm.c +++ b/drivers/dsp/bridge/wmd/io_sm.c @@ -497,11 +497,6 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr) if ((ulSegSize + ulSeg1Size + ulPadSize) > hostRes.dwMemLength[1]) { - DBG_Trace(DBG_LEVEL7, "ulGppPa %x, ulGppVa %x, ulDspVa " - "%x, ulShm0End %x, ulDynExtBase %x, ulExtEnd " - "%x, ulSegSize %x, ulSeg1Size %x \n", ulGppPa, - ulGppVa, ulDspVa, ulShm0End, ulDynExtBase, - ulExtEnd, ulSegSize, ulSeg1Size); DBG_Trace(DBG_LEVEL7, "Insufficient SHM Reserved 0x%x. " "Required 0x%x\n", hostRes.dwMemLength[1], ulSegSize + ulSeg1Size + ulPadSize); @@ -1532,7 +1527,6 @@ static void OutputMsg(struct IO_MGR *pIOMgr, struct MSG_MGR *hMsgMgr) /* Copy uMsgs messages into shared memory */ for (i = 0; i < uMsgs; i++) { if (!hMsgMgr->msgUsedList) { - DBG_Trace(DBG_LEVEL3, "msgUsedList is NULL\n"); pMsg = NULL; goto func_end; } else { @@ -1568,8 +1562,6 @@ static void OutputMsg(struct IO_MGR *pIOMgr, struct MSG_MGR *hMsgMgr) LST_PutTail(hMsgMgr->msgFreeList, (struct list_head *)pMsg); SYNC_SetEvent(hMsgMgr->hSyncEvent); - } else { - DBG_Trace(DBG_LEVEL3, "pMsg is NULL\n"); } } @@ -1650,13 +1642,6 @@ static DSP_STATUS registerSHMSegs(struct IO_MGR *hIOMgr, if (DSP_SUCCEEDED(status)) { status = CMM_UnRegisterGPPSMSeg(hIOMgr->hCmmMgr, CMM_ALLSEGMENTS); - if (DSP_FAILED(status)) { - DBG_Trace(DBG_LEVEL7, "ERROR - Unable to " - "Un-Register SM segments \n"); - } - } else { - DBG_Trace(DBG_LEVEL7, "ERROR - Unable to get CMM " - "Handle \n"); } } /* Register new SM region(s) */ @@ -1711,10 +1696,6 @@ static DSP_STATUS registerSHMSegs(struct IO_MGR *hIOMgr, CMM_ADDTODSPPA : CMM_SUBFROMDSPPA, (u32)(ulShm0_Base * hIOMgr->uWordSize), ulDSPSize, &ulShmSegId0, dwGPPBaseVA); - if (DSP_FAILED(status)) { - DBG_Trace(DBG_LEVEL7, "ERROR - Failed to register SM " - "Seg 0 \n"); - } /* First SM region is segId = 1 */ if (ulShmSegId0 != 1) status = DSP_EFAIL; @@ -1925,10 +1906,8 @@ static DSP_STATUS PackTraceBuffer(char *lpBuf, u32 nBytes, u32 ulNumWords) /* Tmp workspace, 1 KB longer than input buf */ lpTmpBuf = MEM_Calloc((nBytes + ulNumWords), MEM_PAGED); - if (lpTmpBuf == NULL) { - DBG_Trace(DBG_LEVEL7, "PackTrace buffer:OutofMemory \n"); + if (lpTmpBuf == NULL) status = DSP_EMEMORY; - } if (DSP_SUCCEEDED(status)) { lpBufStart = lpBuf; @@ -1997,25 +1976,14 @@ DSP_STATUS PrintDspTraceBuffer(struct WMD_DEV_CONTEXT *hWmdContext) pWmdContext->hDevObject; status = DEV_GetCodMgr(pDevObject, &hCodMgr); - if (DSP_FAILED(status)) - GT_0trace(dsp_trace_mask, GT_2CLASS, - "PrintDspTraceBuffer: Failed on DEV_GetCodMgr.\n"); if (DSP_SUCCEEDED(status)) { /* Look for SYS_PUTCBEG/SYS_PUTCEND */ status = COD_GetSymValue(hCodMgr, COD_TRACEBEG, &ulTraceBegin); - if (DSP_FAILED(status)) - GT_0trace(dsp_trace_mask, GT_2CLASS, - "PrintDspTraceBuffer: Failed on " - "COD_GetSymValue.\n"); } - if (DSP_SUCCEEDED(status)) { + if (DSP_SUCCEEDED(status)) status = COD_GetSymValue(hCodMgr, COD_TRACEEND, &ulTraceEnd); - if (DSP_FAILED(status)) - GT_0trace(dsp_trace_mask, GT_2CLASS, - "PrintDspTraceBuffer: Failed on " - "COD_GetSymValue.\n"); - } + if (DSP_SUCCEEDED(status)) { ulNumBytes = (ulTraceEnd - ulTraceBegin) * ulWordSize; /* @@ -2039,10 +2007,6 @@ DSP_STATUS PrintDspTraceBuffer(struct WMD_DEV_CONTEXT *hWmdContext) status = (*pIntfFxns->pfnBrdRead)(hWmdContext, (u8 *)pszBuf, (u32)ulTraceBegin, ulNumBytes, 0); - if (DSP_FAILED(status)) - GT_0trace(dsp_trace_mask, GT_2CLASS, - "PrintDspTraceBuffer: " - "Failed to Read Trace Buffer.\n"); if (DSP_SUCCEEDED(status)) { /* Pack and do newline conversion */ @@ -2053,9 +2017,6 @@ DSP_STATUS PrintDspTraceBuffer(struct WMD_DEV_CONTEXT *hWmdContext) kfree(pszBuf); kfree(lpszBuf); } else { - GT_0trace(dsp_trace_mask, GT_2CLASS, - "PrintDspTraceBuffer: Failed to " - "allocate trace buffer.\n"); status = DSP_EMEMORY; } } diff --git a/drivers/dsp/bridge/wmd/tiomap3430.c b/drivers/dsp/bridge/wmd/tiomap3430.c index ce8e619..a8dbbfe 100644 --- a/drivers/dsp/bridge/wmd/tiomap3430.c +++ b/drivers/dsp/bridge/wmd/tiomap3430.c @@ -371,8 +371,6 @@ static DSP_STATUS WMD_BRD_Read(struct WMD_DEV_CONTEXT *hDevContext, u32 dspBaseAddr = hDevContext->dwDspBaseAddr; if (dwDSPAddr < pDevContext->dwDSPStartAdd) { - DBG_Trace(DBG_LEVEL7, - "WMD_BRD_Read: DSP address < start address \n "); status = DSP_EFAIL; return status; } @@ -577,8 +575,6 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, CLK_Set_32KHz(BPWR_Clks[clkIdIndex].funClk); } else { status = DSP_EFAIL; - DBG_Trace(DBG_LEVEL7, " Error while setting" - "LM Timer to 32KHz\n"); } uClkCmd = (BPWR_EnableClock << MBX_PM_CLK_CMDSHIFT) | ulLoadMonitorTimer; @@ -614,8 +610,6 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, BPWR_Clks[clkIdIndex].funClk); } else { status = DSP_EFAIL; - DBG_Trace(DBG_LEVEL7, - " Error while setting BIOS Timer to 32KHz\n"); } uClkCmd = (BPWR_EnableClock << MBX_PM_CLK_CMDSHIFT) | @@ -698,11 +692,9 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, /* Wait for DSP to clear word in shared memory */ /* Read the Location */ - if (!WaitForStart(pDevContext, dwSyncAddr)) { + if (!WaitForStart(pDevContext, dwSyncAddr)) status = WMD_E_TIMEOUT; - DBG_Trace(DBG_LEVEL7, - "WMD_BRD_Start Failed to Synchronize\n"); - } + status = DEV_GetIOMgr(pDevContext->hDevObject, &hIOMgr); if (DSP_SUCCEEDED(status)) { IO_SHMsetting(hIOMgr, SHM_OPPINFO, NULL); @@ -716,7 +708,6 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, /* (void)CHNLSM_EnableInterrupt(pDevContext);*/ } else { pDevContext->dwBrdState = BRD_UNKNOWN; - DBG_Trace(DBG_LEVEL7, "Device not Started \n "); } } return status; @@ -751,12 +742,8 @@ static DSP_STATUS WMD_BRD_Stop(struct WMD_DEV_CONTEXT *hDevContext) status = CFG_GetHostResources( (struct CFG_DEVNODE *)DRV_GetFirstDevExtension(), &resources); - if (DSP_FAILED(status)) { - DBG_Trace(DBG_LEVEL7, - "WMD_BRD_Stop: Get Host resources failed \n"); - DBG_Trace(DBG_LEVEL1, "Device Stopp failed \n "); + if (DSP_FAILED(status)) return DSP_EFAIL; - } HW_PWRST_IVA2RegGet(resources.dwPrmBase, &dspPwrState); if (dspPwrState != HW_PWR_STATE_OFF) { @@ -766,11 +753,7 @@ static DSP_STATUS WMD_BRD_Stop(struct WMD_DEV_CONTEXT *hDevContext) udelay(50); clk_status = CLK_Disable(SERVICESCLK_iva2_ck); - if (DSP_FAILED(clk_status)) { - DBG_Trace(DBG_LEVEL6, - "\n WMD_BRD_Stop: CLK_Disable failed " - "for iva2_fck\n"); - } + /* IVA2 is not in OFF state */ /* Set PM_PWSTCTRL_IVA2 to OFF */ HW_PWR_IVA2PowerStateSet(resources.dwPrmBase, @@ -780,11 +763,6 @@ static DSP_STATUS WMD_BRD_Stop(struct WMD_DEV_CONTEXT *hDevContext) HW_PWR_CLKCTRL_IVA2RegSet(resources.dwCmBase, HW_SW_SUP_SLEEP); } else { clk_status = CLK_Disable(SERVICESCLK_iva2_ck); - if (DSP_FAILED(clk_status)) { - DBG_Trace(DBG_LEVEL6, - "\n WMD_BRD_Stop: Else loop CLK_Disable failed" - " for iva2_fck\n"); - } } udelay(10); /* Release the Ext Base virtual Address as the next DSP Program @@ -838,18 +816,12 @@ static DSP_STATUS WMD_BRD_Delete(struct WMD_DEV_CONTEXT *hDevContext) * IVA2 */ status = CFG_GetHostResources( (struct CFG_DEVNODE *)DRV_GetFirstDevExtension(), &resources); - if (DSP_FAILED(status)) { - DBG_Trace(DBG_LEVEL7, - "WMD_BRD_Stop: Get Host resources failed \n"); - DBG_Trace(DBG_LEVEL1, "Device Delete failed \n "); + if (DSP_FAILED(status)) return DSP_EFAIL; - } + status = SleepDSP(pDevContext, PWR_EMERGENCYDEEPSLEEP, NULL); clk_status = CLK_Disable(SERVICESCLK_iva2_ck); - if (DSP_FAILED(clk_status)) { - DBG_Trace(DBG_LEVEL6, "\n WMD_BRD_Stop: CLK_Disable failed for" - " iva2_fck\n"); - } + /* Release the Ext Base virtual Address as the next DSP Program * may have a different load address */ if (pDevContext->dwDspExtBaseAddr) @@ -897,8 +869,6 @@ static DSP_STATUS WMD_BRD_Write(struct WMD_DEV_CONTEXT *hDevContext, struct WMD_DEV_CONTEXT *pDevContext = hDevContext; if (dwDSPAddr < pDevContext->dwDSPStartAdd) { - DBG_Trace(DBG_LEVEL7, - "WMD_BRD_Write: DSP address < start address \n "); status = DSP_EFAIL; return status; } @@ -938,14 +908,12 @@ static DSP_STATUS WMD_DEV_Create(OUT struct WMD_DEV_CONTEXT **ppDevContext, * state, which becomes the context for later calls into this WMD. */ pDevContext = MEM_Calloc(sizeof(struct WMD_DEV_CONTEXT), MEM_NONPAGED); if (!pDevContext) { - DBG_Trace(DBG_ENTER, "Failed to allocate mem \n"); status = DSP_EMEMORY; goto func_end; } status = CFG_GetHostResources( (struct CFG_DEVNODE *)DRV_GetFirstDevExtension(), &resources); if (DSP_FAILED(status)) { - DBG_Trace(DBG_ENTER, "Failed to get host resources \n"); status = DSP_EMEMORY; goto func_end; } @@ -963,11 +931,9 @@ static DSP_STATUS WMD_DEV_Create(OUT struct WMD_DEV_CONTEXT **ppDevContext, pDevContext->numTLBEntries = 0; pDevContext->dwDspBaseAddr = (u32)MEM_LinearAddress((void *) (pConfig->dwMemBase[3]), pConfig->dwMemLength[3]); - if (!pDevContext->dwDspBaseAddr) { + if (!pDevContext->dwDspBaseAddr) status = DSP_EFAIL; - DBG_Trace(DBG_LEVEL7, - "WMD_DEV_Create: failed to Map the API memory\n"); - } + pPtAttrs = MEM_Calloc(sizeof(struct PgTableAttrs), MEM_NONPAGED); if (pPtAttrs != NULL) { /* Assuming that we use only DSP's memory map @@ -1059,11 +1025,6 @@ static DSP_STATUS WMD_DEV_Create(OUT struct WMD_DEV_CONTEXT **ppDevContext, if (DSP_SUCCEEDED(status)) { /* Set the Clock Divisor for the DSP module */ status = CLK_Enable(SERVICESCLK_mailbox_ick); - if (DSP_FAILED(status)) { - DBG_Trace(DBG_LEVEL7, - "WMD_DEV_create:Reset mail box and " - "enable the clock Fail\n"); - } udelay(5); /* 24xx-Linux MMU address is obtained from the host * resources struct */ @@ -1095,11 +1056,7 @@ static DSP_STATUS WMD_DEV_Create(OUT struct WMD_DEV_CONTEXT **ppDevContext, } } kfree(pPtAttrs); - kfree(pDevContext); - - DBG_Trace(DBG_LEVEL7, - "WMD_DEV_Create Error Device not created\n"); } func_end: return status; @@ -1154,7 +1111,6 @@ static DSP_STATUS WMD_DEV_Ctrl(struct WMD_DEV_CONTEXT *pDevContext, u32 dwCmd, break; default: status = DSP_EFAIL; - DBG_Trace(DBG_LEVEL7, "Error in WMD_BRD_Ioctl \n"); break; } return status; @@ -1332,8 +1288,6 @@ static DSP_STATUS WMD_BRD_MemMap(struct WMD_DEV_CONTEXT *hDevContext, * Mixedsize isn't enabled, so size can't be * zero here */ - DBG_Trace(DBG_LEVEL7, - "WMD_BRD_MemMap: MMU element size is zero\n"); return DSP_EINVALIDARG; } } @@ -1414,12 +1368,9 @@ static DSP_STATUS WMD_BRD_MemMap(struct WMD_DEV_CONTEXT *hDevContext, } status = PteSet(pDevContext->pPtAttrs, pa, va, HW_PAGE_SIZE_4KB, &hwAttrs); - if (DSP_FAILED(status)) { - DBG_Trace(DBG_LEVEL7, - "WMD_BRD_MemMap: FAILED IN VM_IO" - "PTESET \n"); + if (DSP_FAILED(status)) break; - } + va += HW_PAGE_SIZE_4KB; mpuAddr += HW_PAGE_SIZE_4KB; pa += HW_PAGE_SIZE_4KB; @@ -1443,11 +1394,9 @@ static DSP_STATUS WMD_BRD_MemMap(struct WMD_DEV_CONTEXT *hDevContext, status = PteSet(pDevContext->pPtAttrs, page_to_phys(mappedPage), va, HW_PAGE_SIZE_4KB, &hwAttrs); - if (DSP_FAILED(status)) { - DBG_Trace(DBG_LEVEL7, - "WMD_BRD_MemMap: FAILED IN PTESET \n"); + if (DSP_FAILED(status)) break; - } + va += HW_PAGE_SIZE_4KB; ulMpuAddr += HW_PAGE_SIZE_4KB; } else { diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c index 5acaf44..270655a 100644 --- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c +++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c @@ -145,9 +145,6 @@ DSP_STATUS handle_hibernation_fromDSP(struct WMD_DEV_CONTEXT *pDevContext) (*pdata->dsp_set_min_opp)(VDD1_OPP1); status = DSP_SOK; #endif /* CONFIG_BRIDGE_DVFS */ - } else { - DBG_Trace(DBG_LEVEL7, - "handle_hibernation_fromDSP- FAILED\n"); } } #endif @@ -171,10 +168,8 @@ DSP_STATUS SleepDSP(struct WMD_DEV_CONTEXT *pDevContext, IN u32 dwCmd, enum HW_PwrState_t pwrState, targetPwrState; /* Check if sleep code is valid */ - if ((dwCmd != PWR_DEEPSLEEP) && (dwCmd != PWR_EMERGENCYDEEPSLEEP)) { - DBG_Trace(DBG_LEVEL7, "SleepDSP- Illegal sleep command\n"); + if ((dwCmd != PWR_DEEPSLEEP) && (dwCmd != PWR_EMERGENCYDEEPSLEEP)) return DSP_EINVALIDARG; - } status = CFG_GetHostResources( (struct CFG_DEVNODE *)DRV_GetFirstDevExtension(), &resources); @@ -254,7 +249,6 @@ DSP_STATUS SleepDSP(struct WMD_DEV_CONTEXT *pDevContext, IN u32 dwCmd, /* Turn off DSP Peripheral clocks */ status = DSP_PeripheralClocks_Disable(pDevContext, NULL); if (DSP_FAILED(status)) { - DBG_Trace(DBG_LEVEL7, "SleepDSP- FAILED\n"); return status; } #ifdef CONFIG_BRIDGE_DVFS @@ -356,9 +350,6 @@ DSP_STATUS DSPPeripheralClkCtrl(struct WMD_DEV_CONTEXT *pDevContext, * just return with failure when the CLK ID does not match */ /* DBC_Assert(clkIdIndex < MBX_PM_MAX_RESOURCES);*/ if (clkIdIndex == MBX_PM_MAX_RESOURCES) { - DBG_Trace(DBG_LEVEL7, - "DSPPeripheralClkCtrl : Could n't get clock Id for" - "clkid 0x%x \n", clkIdIndex); /* return with a more meaningfull error code */ return DSP_EFAIL; } @@ -383,9 +374,6 @@ DSP_STATUS DSPPeripheralClkCtrl(struct WMD_DEV_CONTEXT *pDevContext, if ((DSP_SUCCEEDED(status)) && (DSP_SUCCEEDED(status1))) { (pDevContext->uDspPerClks) &= (~((u32) (1 << clkIdIndex))); - } else { - DBG_Trace(DBG_LEVEL7, "DSPPeripheralClkCtrl : Failed " - "to disable clk\n"); } break; case BPWR_EnableClock: @@ -405,9 +393,6 @@ DSP_STATUS DSPPeripheralClkCtrl(struct WMD_DEV_CONTEXT *pDevContext, DSPClkWakeupEventCtrl(BPWR_Clks[clkIdIndex].clkId, true); if ((DSP_SUCCEEDED(status)) && (DSP_SUCCEEDED(status1))) { (pDevContext->uDspPerClks) |= (1 << clkIdIndex); - } else { - DBG_Trace(DBG_LEVEL7, - "DSPPeripheralClkCtrl:Failed to Enable clk\n"); } break; default: @@ -449,8 +434,6 @@ DSP_STATUS PreScale_DSP(struct WMD_DEV_CONTEXT *pDevContext, IN void *pArgs) CHNLSM_InterruptDSP2(pDevContext, MBX_PM_SETPOINT_PRENOTIFY); return DSP_SOK; } else { - DBG_Trace(DBG_LEVEL7, "PreScale_DSP: Failed - DSP BRD" - " state in wrong state"); return DSP_EFAIL; } #endif /* #ifdef CONFIG_BRIDGE_DVFS */ @@ -496,8 +479,6 @@ DSP_STATUS PostScale_DSP(struct WMD_DEV_CONTEXT *pDevContext, IN void *pArgs) "PostScale_DSP: Wrote to shared memory Sent post" " notification to DSP\n"); } else { - DBG_Trace(DBG_LEVEL7, "PostScale_DSP: Failed - DSP BRD state " - "in wrong state"); status = DSP_EFAIL; } #endif /* #ifdef CONFIG_BRIDGE_DVFS */ @@ -539,18 +520,9 @@ DSP_STATUS DSP_PeripheralClocks_Disable(struct WMD_DEV_CONTEXT *pDevContext, __raw_writel(value, resources.dwSysCtrlBase + 0x274); } - if (DSP_FAILED(status)) { - DBG_Trace(DBG_LEVEL7, - "Failed to Enable the DSP Peripheral" - "Clk 0x%x \n", BPWR_Clks[clkIdx]); - } + /* Disables the functional clock of the periphearl */ status = CLK_Disable(BPWR_Clks[clkIdx].funClk); - if (DSP_FAILED(status)) { - DBG_Trace(DBG_LEVEL7, - "Failed to Enable the DSP Peripheral" - "Clk 0x%x \n", BPWR_Clks[clkIdx]); - } } } return status; diff --git a/drivers/dsp/bridge/wmd/tiomap_io.c b/drivers/dsp/bridge/wmd/tiomap_io.c index 2d32b26..d11d605 100644 --- a/drivers/dsp/bridge/wmd/tiomap_io.c +++ b/drivers/dsp/bridge/wmd/tiomap_io.c @@ -151,22 +151,16 @@ DSP_STATUS ReadExtDspData(struct WMD_DEV_CONTEXT *hDevContext, /* This dwDspExtBaseAddr will get cleared only when the board is * stopped. */ - if (!pDevContext->dwDspExtBaseAddr) { + if (!pDevContext->dwDspExtBaseAddr) status = DSP_EFAIL; - DBG_Trace(DBG_LEVEL7, "ReadExtDspData: " - "failed to Map the program memory\n"); - } } dwBaseAddr = dwExtProgVirtMem; } } - if (!dwBaseAddr || !ulExtBase || !ulExtEnd) { - DBG_Trace(DBG_LEVEL7, - "Symbols missing for Ext Prog reading \n"); + if (!dwBaseAddr || !ulExtBase || !ulExtEnd) status = DSP_EFAIL; - } offset = dwDSPAddr - ulExtBase; @@ -346,30 +340,21 @@ DSP_STATUS WriteExtDspData(struct WMD_DEV_CONTEXT *pDevContext, dwBaseAddr += pDevContext->dwDspExtBaseAddr; /* This dwDspExtBaseAddr will get cleared only when * the board is stopped. */ - if (!pDevContext->dwDspExtBaseAddr) { + if (!pDevContext->dwDspExtBaseAddr) retVal = DSP_EFAIL; - DBG_Trace(DBG_LEVEL7, "WriteExtDspData: failed " - "to Map the program memory\n"); - } } } - if (!dwBaseAddr || !ulExtBase || !ulExtEnd) { - DBG_Trace(DBG_LEVEL7, "Symbols missing for Ext Prog loading\n"); + if (!dwBaseAddr || !ulExtBase || !ulExtEnd) retVal = DSP_EFAIL; - } + if (DSP_SUCCEEDED(retVal)) { for (i = 0; i < 4; i++) remainByte[i] = 0x0; dwOffset = dwDSPAddr - ulExtBase; /* Also make sure the dwDSPAddr is < ulExtEnd */ - if (dwDSPAddr > ulExtEnd || dwOffset > dwDSPAddr) { - DBG_Trace(DBG_LEVEL7, "We can not load at this address " - "dwDSPAddr=0x%x, ulExt/DynBase=0x%x, " - "ulExtEnd=0x%x\n", dwDSPAddr, ulExtBase, - ulExtEnd); + if (dwDSPAddr > ulExtEnd || dwOffset > dwDSPAddr) retVal = DSP_EFAIL; - } } if (DSP_SUCCEEDED(retVal)) { if (ulNumBytes) diff --git a/drivers/dsp/bridge/wmd/ue_deh.c b/drivers/dsp/bridge/wmd/ue_deh.c index 032a6e3..031a1c8 100644 --- a/drivers/dsp/bridge/wmd/ue_deh.c +++ b/drivers/dsp/bridge/wmd/ue_deh.c @@ -189,9 +189,6 @@ void WMD_DEH_Notify(struct DEH_MGR *hDehMgr, u32 ulEventMask, status = CFG_GetHostResources( (struct CFG_DEVNODE *)DRV_GetFirstDevExtension(), &resources); - if (DSP_FAILED(status)) - DBG_Trace(DBG_LEVEL7, - "**Failed to get Host Resources in MMU ISR **\n"); if (MEM_IsValidHandle(pDehMgr, SIGNATURE)) { printk(KERN_INFO "WMD_DEH_Notify: ********** DEVICE EXCEPTION " -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 11/18] DSPBRIDGE: Remove excessive debug statements for pmgr 2010-02-16 8:42 ` [PATCH 10/18] DSPBRIDGE: Remove excessive debug statements for wmd Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 12/18] DSPBRIDGE: Remove excessive debug statements for services Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna Removed debug statements that print redundant errors where returned statuses should be enough in case of failure. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/pmgr/chnl.c | 20 +++------ drivers/dsp/bridge/pmgr/cmm.c | 58 ++------------------------ drivers/dsp/bridge/pmgr/cod.c | 57 +++++--------------------- drivers/dsp/bridge/pmgr/dbll.c | 26 +---------- drivers/dsp/bridge/pmgr/dev.c | 88 +++------------------------------------ drivers/dsp/bridge/pmgr/dmm.c | 8 +--- drivers/dsp/bridge/pmgr/io.c | 10 +---- drivers/dsp/bridge/pmgr/wcd.c | 17 +------ 8 files changed, 37 insertions(+), 247 deletions(-) diff --git a/drivers/dsp/bridge/pmgr/chnl.c b/drivers/dsp/bridge/pmgr/chnl.c index 802f71c..14a060c 100644 --- a/drivers/dsp/bridge/pmgr/chnl.c +++ b/drivers/dsp/bridge/pmgr/chnl.c @@ -75,22 +75,16 @@ DSP_STATUS CHNL_Create(OUT struct CHNL_MGR **phChnlMgr, /* Validate args: */ if ((0 < pMgrAttrs->cChannels) && - (pMgrAttrs->cChannels <= CHNL_MAXCHANNELS)) { + (pMgrAttrs->cChannels <= CHNL_MAXCHANNELS)) status = DSP_SOK; - } else if (pMgrAttrs->cChannels == 0) { + else if (pMgrAttrs->cChannels == 0) status = DSP_EINVALIDARG; - GT_0trace(CHNL_DebugMask, GT_7CLASS, - "CHNL_Create:Invalid Args\n"); - } else { + else status = CHNL_E_MAXCHANNELS; - GT_0trace(CHNL_DebugMask, GT_7CLASS, - "CHNL_Create:Error Max Channels\n"); - } - if (pMgrAttrs->uWordSize == 0) { + + if (pMgrAttrs->uWordSize == 0) status = CHNL_E_INVALIDWORDSIZE; - GT_0trace(CHNL_DebugMask, GT_7CLASS, - "CHNL_Create:Invalid Word size\n"); - } + if (DSP_SUCCEEDED(status)) { status = DEV_GetChnlMgr(hDevObject, &hChnlMgr); if (DSP_SUCCEEDED(status) && hChnlMgr != NULL) @@ -137,8 +131,6 @@ DSP_STATUS CHNL_Destroy(struct CHNL_MGR *hChnlMgr) /* Let WMD channel module destroy the CHNL_MGR: */ status = (*pIntfFxns->pfnChnlDestroy)(hChnlMgr); } else { - GT_0trace(CHNL_DebugMask, GT_7CLASS, - "CHNL_Destroy:Invalid Handle\n"); status = DSP_EHANDLE; } diff --git a/drivers/dsp/bridge/pmgr/cmm.c b/drivers/dsp/bridge/pmgr/cmm.c index e422dc5..56f97a7 100644 --- a/drivers/dsp/bridge/pmgr/cmm.c +++ b/drivers/dsp/bridge/pmgr/cmm.c @@ -276,9 +276,6 @@ DSP_STATUS CMM_Create(OUT struct CMM_OBJECT **phCmmMgr, if (DSP_SUCCEEDED(status)) { pCmmObject->dwPageSize = sysInfo.dwPageSize; } else { - GT_0trace(CMM_debugMask, GT_7CLASS, - "CMM_Create: failed to get system" - "page size\n"); pCmmObject->dwPageSize = 0; status = DSP_EFAIL; } @@ -288,14 +285,11 @@ DSP_STATUS CMM_Create(OUT struct CMM_OBJECT **phCmmMgr, /* create node free list */ pCmmObject->pNodeFreeListHead = MEM_Calloc(sizeof(struct LST_LIST), MEM_NONPAGED); - if (pCmmObject->pNodeFreeListHead == NULL) { - GT_0trace(CMM_debugMask, GT_7CLASS, - "CMM_Create: Out of memory\n"); + if (pCmmObject->pNodeFreeListHead == NULL) status = DSP_EMEMORY; - } else { + else INIT_LIST_HEAD(&pCmmObject->pNodeFreeListHead-> head); - } } if (DSP_SUCCEEDED(status)) status = SYNC_InitializeCS(&pCmmObject->hCmmLock); @@ -306,9 +300,6 @@ DSP_STATUS CMM_Create(OUT struct CMM_OBJECT **phCmmMgr, CMM_Destroy(pCmmObject, true); } else { - GT_0trace(CMM_debugMask, GT_6CLASS, - "CMM_Create: Object Allocation " - "Failure(CMM Object)\n"); status = DSP_EMEMORY; } return status; @@ -591,9 +582,6 @@ DSP_STATUS CMM_RegisterGPPSMSeg(struct CMM_OBJECT *hCmmMgr, u32 dwGPPBasePA, /* Check if input ulSize is big enough to alloc at least one block */ if (DSP_SUCCEEDED(status)) { if (ulSize < pCmmMgr->ulMinBlockSize) { - GT_0trace(CMM_debugMask, GT_7CLASS, - "CMM_RegisterGPPSMSeg: " - "ulSize too small\n"); status = DSP_EINVALIDARG; goto func_end; } @@ -612,9 +600,6 @@ DSP_STATUS CMM_RegisterGPPSMSeg(struct CMM_OBJECT *hCmmMgr, u32 dwGPPBasePA, pSMA->dwDSPBase = dwDSPBase; pSMA->ulDSPSize = ulDSPSize; if (pSMA->dwVmBase == 0) { - GT_0trace(CMM_debugMask, GT_7CLASS, - "CMM_RegisterGPPSMSeg: Error" - "MEM_LinearAddress()\n"); status = DSP_EFAIL; goto func_end; } @@ -625,9 +610,6 @@ DSP_STATUS CMM_RegisterGPPSMSeg(struct CMM_OBJECT *hCmmMgr, u32 dwGPPBasePA, pSMA->pFreeListHead = MEM_Calloc(sizeof(struct LST_LIST), MEM_NONPAGED); if (pSMA->pFreeListHead == NULL) { - GT_0trace(CMM_debugMask, GT_7CLASS, - "CMM_RegisterGPPSMSeg: " - "Out Of Memory 1\n"); status = DSP_EMEMORY; goto func_end; } @@ -638,9 +620,6 @@ DSP_STATUS CMM_RegisterGPPSMSeg(struct CMM_OBJECT *hCmmMgr, u32 dwGPPBasePA, pSMA->pInUseListHead = MEM_Calloc(sizeof(struct LST_LIST), MEM_NONPAGED); if (pSMA->pInUseListHead == NULL) { - GT_0trace(CMM_debugMask, GT_7CLASS, - "CMM_RegisterGPPSMSeg: " - "Out of memory 2\n"); status = DSP_EMEMORY; goto func_end; } @@ -664,9 +643,6 @@ DSP_STATUS CMM_RegisterGPPSMSeg(struct CMM_OBJECT *hCmmMgr, u32 dwGPPBasePA, UnRegisterGPPSMSeg(pSMA); } } else { - GT_0trace(CMM_debugMask, GT_6CLASS, - "CMM_RegisterGPPSMSeg: SMA Object " - "Allocation Failure\n"); status = DSP_EMEMORY; goto func_end; } @@ -717,9 +693,6 @@ DSP_STATUS CMM_UnRegisterGPPSMSeg(struct CMM_OBJECT *hCmmMgr, u32 ulSegId) } /* end while */ } else { status = DSP_EINVALIDARG; - GT_0trace(CMM_debugMask, GT_7CLASS, - "CMM_UnRegisterGPPSMSeg: Bad " - "segment Id\n"); } } else { status = DSP_EHANDLE; @@ -791,12 +764,9 @@ static s32 GetSlot(struct CMM_OBJECT *pCmmMgr) break; } - if (nSlot == CMM_MAXGPPSEGS) { - GT_0trace(CMM_debugMask, GT_7CLASS, - "CMM_RegisterGPPSMSeg: Allocator " - "entry failure, max exceeded\n"); + if (nSlot == CMM_MAXGPPSEGS) nSlot = -1; /* failed */ - } + return nSlot; } @@ -823,9 +793,7 @@ static struct CMM_MNODE *GetNode(struct CMM_OBJECT *pCmmMgr, u32 dwPA, pNode = (struct CMM_MNODE *)LST_GetHead(pCmmMgr-> pNodeFreeListHead); } - if (pNode == NULL) { - GT_0trace(CMM_debugMask, GT_7CLASS, "GetNode: Out Of Memory\n"); - } else { + if (pNode) { LST_InitElem((struct list_head *) pNode); /* set self */ pNode->dwPA = dwPA; /* Physical addr of start of block */ pNode->dwVA = dwVA; /* Virtual " " */ @@ -1007,9 +975,6 @@ DSP_STATUS CMM_XlatorCreate(OUT struct CMM_XLATOROBJECT **phXlator, pXlatorObject->hCmmMgr = hCmmMgr; /* ref back to CMM */ pXlatorObject->ulSegId = pXlatorAttrs->ulSegId; /* SM segId */ } else { - GT_0trace(CMM_debugMask, GT_6CLASS, - "CMM_XlatorCreate: Object Allocation" - "Failure(CMM Xlator)\n"); status = DSP_EMEMORY; } if (DSP_SUCCEEDED(status)) @@ -1098,10 +1063,6 @@ DSP_STATUS CMM_XlatorFreeBuf(struct CMM_XLATOROBJECT *hXlator, void *pBufVa) if (DSP_FAILED(status)) { /* Uh oh, this shouldn't happen. Descriptor * gone! */ - GT_2trace(CMM_debugMask, GT_7CLASS, - "Cannot free DMA/ZCPY buffer" - "not allocated by MPU. PA %x, VA %x\n", - pBufPa, pBufVa); DBC_Assert(false); /* CMM is leaking mem! */ } } @@ -1176,9 +1137,6 @@ void *CMM_XlatorTranslate(struct CMM_XLATOROBJECT *hXlator, void *pAddr, (dwAddrXlate >= (pXlator->dwVirtBase + pXlator->ulVirtSize))) { dwAddrXlate = 0; /* bad address */ - GT_0trace(CMM_debugMask, GT_7CLASS, - "CMM_XlatorTranslate: " - "Virt addr out of range\n"); } } else { /* Gpp PA = Gpp Base + offset */ @@ -1204,11 +1162,5 @@ void *CMM_XlatorTranslate(struct CMM_XLATOROBJECT *hXlator, void *pAddr, pAlctr->cFactor); } loop_cont: - if (!dwAddrXlate) { - GT_2trace(CMM_debugMask, GT_7CLASS, - "CMM_XlatorTranslate: Can't translate" - " address: 0x%x xType %x\n", pAddr, xType); - } - return (void *)dwAddrXlate; } diff --git a/drivers/dsp/bridge/pmgr/cod.c b/drivers/dsp/bridge/pmgr/cod.c index 25921fb..eb74fb8 100644 --- a/drivers/dsp/bridge/pmgr/cod.c +++ b/drivers/dsp/bridge/pmgr/cod.c @@ -240,11 +240,8 @@ DSP_STATUS COD_Create(OUT struct COD_MANAGER **phMgr, char *pstrDummyFile, return DSP_ENOTIMPL; hMgrNew = MEM_Calloc(sizeof(struct COD_MANAGER), MEM_NONPAGED); - if (hMgrNew == NULL) { - GT_0trace(COD_debugMask, GT_7CLASS, - "COD_Create: Out Of Memory\n"); + if (hMgrNew == NULL) return DSP_EMEMORY; - } hMgrNew->ulMagic = MAGIC; @@ -277,8 +274,6 @@ DSP_STATUS COD_Create(OUT struct COD_MANAGER **phMgr, char *pstrDummyFile, if (DSP_FAILED(status)) { COD_Delete(hMgrNew); - GT_1trace(COD_debugMask, GT_7CLASS, - "COD_Create:ZL Create Failed: 0x%x\n", status); return COD_E_ZLCREATEFAILED; } @@ -427,15 +422,8 @@ DSP_STATUS COD_GetSection(struct COD_LIBRARYOBJ *lib, IN char *pstrSect, hManager = lib->hCodMgr; status = hManager->fxns.getSectFxn(lib->dbllLib, pstrSect, puAddr, puLen); - if (DSP_FAILED(status)) { - GT_1trace(COD_debugMask, GT_7CLASS, - "COD_GetSection: Section %s not" - "found\n", pstrSect); - } } else { status = COD_E_NOSYMBOLSLOADED; - GT_0trace(COD_debugMask, GT_7CLASS, - "COD_GetSection:No Symbols loaded\n"); } DBC_Ensure(DSP_SUCCEEDED(status) || ((*puAddr == 0) && (*puLen == 0))); @@ -467,16 +455,10 @@ DSP_STATUS COD_GetSymValue(struct COD_MANAGER *hMgr, char *pstrSym, if (hMgr->baseLib) { if (!hMgr->fxns.getAddrFxn(hMgr->baseLib, pstrSym, &pSym)) { if (!hMgr->fxns.getCAddrFxn(hMgr->baseLib, pstrSym, - &pSym)) { - GT_0trace(COD_debugMask, GT_7CLASS, - "COD_GetSymValue: " - "Symbols not found\n"); + &pSym)) return COD_E_SYMBOLNOTFOUND; - } } } else { - GT_0trace(COD_debugMask, GT_7CLASS, "COD_GetSymValue: " - "No Symbols loaded\n"); return COD_E_NOSYMBOLSLOADED; } @@ -565,12 +547,9 @@ DSP_STATUS COD_LoadBase(struct COD_MANAGER *hMgr, u32 nArgc, char *aArgs[], flags = DBLL_CODE | DBLL_DATA | DBLL_SYMB; status = hMgr->fxns.loadFxn(hMgr->baseLib, flags, &newAttrs, &hMgr->ulEntry); - if (DSP_FAILED(status)) { + if (DSP_FAILED(status)) hMgr->fxns.closeFxn(hMgr->baseLib); - GT_1trace(COD_debugMask, GT_7CLASS, - "COD_LoadBase: COD Load failed: " - "0x%x\n", status); - } + if (DSP_SUCCEEDED(status)) hMgr->fLoaded = true; else @@ -602,22 +581,15 @@ DSP_STATUS COD_Open(struct COD_MANAGER *hMgr, IN char *pszCoffPath, *pLib = NULL; lib = MEM_Calloc(sizeof(struct COD_LIBRARYOBJ), MEM_NONPAGED); - if (lib == NULL) { - GT_0trace(COD_debugMask, GT_7CLASS, - "COD_Open: Out Of Memory\n"); + if (lib == NULL) status = DSP_EMEMORY; - } if (DSP_SUCCEEDED(status)) { lib->hCodMgr = hMgr; status = hMgr->fxns.openFxn(hMgr->target, pszCoffPath, flags, &lib->dbllLib); - if (DSP_FAILED(status)) { - GT_1trace(COD_debugMask, GT_7CLASS, - "COD_Open failed: 0x%x\n", status); - } else { + if (DSP_SUCCEEDED(status)) *pLib = lib; - } } return status; @@ -652,10 +624,7 @@ DSP_STATUS COD_OpenBase(struct COD_MANAGER *hMgr, IN char *pszCoffPath, hMgr->baseLib = NULL; } status = hMgr->fxns.openFxn(hMgr->target, pszCoffPath, flags, &lib); - if (DSP_FAILED(status)) { - GT_0trace(COD_debugMask, GT_7CLASS, - "COD_OpenBase: COD Open failed\n"); - } else { + if (DSP_SUCCEEDED(status)) { /* hang onto the library for subsequent sym table usage */ hMgr->baseLib = lib; strncpy(hMgr->szZLFile, pszCoffPath, COD_MAXPATHLENGTH - 1); @@ -681,19 +650,13 @@ DSP_STATUS COD_ReadSection(struct COD_LIBRARYOBJ *lib, IN char *pstrSect, DBC_Require(pstrSect != NULL); DBC_Require(pstrContent != NULL); - if (lib != NULL) { + if (lib != NULL) status = lib->hCodMgr->fxns.readSectFxn(lib->dbllLib, pstrSect, pstrContent, cContentSize); - if (DSP_FAILED(status)) { - GT_1trace(COD_debugMask, GT_7CLASS, - "COD_ReadSection failed: 0x%lx\n", status); - } - } else { + else status = COD_E_NOSYMBOLSLOADED; - GT_0trace(COD_debugMask, GT_7CLASS, - "COD_ReadSection: No Symbols loaded\n"); - } + return status; } diff --git a/drivers/dsp/bridge/pmgr/dbll.c b/drivers/dsp/bridge/pmgr/dbll.c index 367597d..9b31f41 100644 --- a/drivers/dsp/bridge/pmgr/dbll.c +++ b/drivers/dsp/bridge/pmgr/dbll.c @@ -262,9 +262,6 @@ DSP_STATUS DBLL_create(struct DBLL_TarObj **pTarget, struct DBLL_Attrs *pAttrs) MEM_AllocObject(pzlTarget, struct DBLL_TarObj, DBLL_TARGSIGNATURE); if (pTarget != NULL) { if (pzlTarget == NULL) { - GT_0trace(DBLL_debugMask, GT_6CLASS, - "DBLL_create: Memory allocation" - " failed\n"); *pTarget = NULL; status = DSP_EMEMORY; } else { @@ -563,10 +560,6 @@ DSP_STATUS DBLL_load(struct DBLL_LibraryObj *lib, DBLL_Flags flags, &zlLib->mHandle); if (err != 0) { - GT_1trace(DBLL_debugMask, GT_6CLASS, - "DBLL_load: " - "Dynamic_Load_Module failed: 0x%lx\n", - err); status = DSP_EDYNLOAD; } else if (bRedefinedSymbol) { zlLib->loadRef++; @@ -635,8 +628,6 @@ DSP_STATUS DBLL_open(struct DBLL_TarObj *target, char *file, DBLL_Flags flags, MEM_AllocObject(zlLib, struct DBLL_LibraryObj, DBLL_LIBSIGNATURE); if (zlLib == NULL) { - GT_0trace(DBLL_debugMask, GT_6CLASS, - "DBLL_open: Memory allocation failed\n"); status = DSP_EMEMORY; } else { zlLib->ulPos = 0; @@ -648,9 +639,6 @@ DSP_STATUS DBLL_open(struct DBLL_TarObj *target, char *file, DBLL_Flags flags, zlLib->fileName = MEM_Calloc(strlen(file) + 1, MEM_PAGED); if (zlLib->fileName == NULL) { - GT_0trace(DBLL_debugMask, GT_6CLASS, - "DBLL_open: Memory " - "allocation failed\n"); status = DSP_EMEMORY; } else { strncpy(zlLib->fileName, file, @@ -711,8 +699,6 @@ DSP_STATUS DBLL_open(struct DBLL_TarObj *target, char *file, DBLL_Flags flags, &zlLib->init.dlInit, 0, &zlLib->mHandle); if (err != 0) { - GT_1trace(DBLL_debugMask, GT_6CLASS, "DBLL_open: " - "Dynamic_Load_Module failed: 0x%lx\n", err); status = DSP_EDYNLOAD; } else { /* Now that we have the symbol table, we can unload */ @@ -720,13 +706,9 @@ DSP_STATUS DBLL_open(struct DBLL_TarObj *target, char *file, DBLL_Flags flags, &zlLib->symbol.dlSymbol, &zlLib->allocate.dlAlloc, &zlLib->init.dlInit); - if (err != 0) { - GT_1trace(DBLL_debugMask, GT_6CLASS, - "DBLL_open: " - "Dynamic_Unload_Module failed: 0x%lx\n", - err); + if (err != 0) status = DSP_EDYNLOAD; - } + zlLib->mHandle = NULL; } } @@ -889,9 +871,7 @@ DSP_STATUS DBLL_unloadSect(struct DBLL_LibraryObj *lib, char *sectName, { DBC_Require(cRefs > 0); DBC_Require(sectName != NULL); - GT_2trace(DBLL_debugMask, GT_ENTER, - "DBLL_unloadSect: lib: 0x%x sectName: " - "%s\n", lib, sectName); + return DSP_ENOTIMPL; } diff --git a/drivers/dsp/bridge/pmgr/dev.c b/drivers/dsp/bridge/pmgr/dev.c index c6561a4..8ee6d69 100644 --- a/drivers/dsp/bridge/pmgr/dev.c +++ b/drivers/dsp/bridge/pmgr/dev.c @@ -161,8 +161,6 @@ DSP_STATUS DEV_CreateDevice(OUT struct DEV_OBJECT **phDevObject, WMD_DRV_Entry(&pDrvFxns, pstrWMDFileName); if (DSP_FAILED(CFG_GetObject((u32 *) &hDrvObject, REG_DRV_OBJECT))) { /* don't propogate CFG errors from this PROC function */ - GT_0trace(debugMask, GT_7CLASS, - "Failed to get the DRV Object \n"); status = DSP_EFAIL; } /* Create the device object, and pass a handle to the WMD for @@ -193,8 +191,6 @@ DSP_STATUS DEV_CreateDevice(OUT struct DEV_OBJECT **phDevObject, DBC_Assert(DSP_FAILED(status) || (pDevObject-> hWmdContext != NULL)); } else { - GT_0trace(debugMask, GT_7CLASS, - "DEV_Create: Out Of Memory"); status = DSP_EMEMORY; } } @@ -233,11 +229,6 @@ DSP_STATUS DEV_CreateDevice(OUT struct DEV_OBJECT **phDevObject, /* Create CMM mgr even if Msg Mgr not impl. */ status = CMM_Create(&pDevObject->hCmmMgr, (struct DEV_OBJECT *)pDevObject, NULL); - if (DSP_FAILED(status)) { - GT_0trace(debugMask, GT_7CLASS, - "DEV_Create: Failed to Create SM " - "Manager\n"); - } /* Only create IO manager if we have a channel manager */ if (DSP_SUCCEEDED(status) && pDevObject->hChnlMgr) { status = IO_Create(&pDevObject->hIOMgr, pDevObject, @@ -252,11 +243,6 @@ DSP_STATUS DEV_CreateDevice(OUT struct DEV_OBJECT **phDevObject, /* Create DMM mgr . */ status = DMM_Create(&pDevObject->hDmmMgr, (struct DEV_OBJECT *)pDevObject, NULL); - if (DSP_FAILED(status)) { - GT_0trace(debugMask, GT_7CLASS, - "DEV_Create: Failed to Create DMM " - "Manager\n"); - } } /* Add the new DEV_Object to the global list: */ if (DSP_SUCCEEDED(status)) { @@ -267,13 +253,10 @@ DSP_STATUS DEV_CreateDevice(OUT struct DEV_OBJECT **phDevObject, if (DSP_SUCCEEDED(status)) { pDevObject->procList = MEM_Calloc(sizeof(struct LST_LIST), MEM_NONPAGED); - if (!(pDevObject->procList)) { + if (!(pDevObject->procList)) status = DSP_EFAIL; - GT_0trace(debugMask, GT_7CLASS, "DEV_Create: " - "Failed to Create Proc List"); - } else { + else INIT_LIST_HEAD(&pDevObject->procList->head); - } } /* If all went well, return a handle to the dev object; * else, cleanup and return NULL in the OUT parameter. */ @@ -292,7 +275,6 @@ DSP_STATUS DEV_CreateDevice(OUT struct DEV_OBJECT **phDevObject, MEM_FreeObject(pDevObject); *phDevObject = NULL; - GT_0trace(debugMask, GT_7CLASS, "DEV_CreateDevice Failed\n"); } DBC_Ensure((DSP_SUCCEEDED(status) && IsValidHandle(*phDevObject)) || @@ -318,13 +300,9 @@ DSP_STATUS DEV_Create2(struct DEV_OBJECT *hDevObject) /* There can be only one Node Manager per DEV object */ DBC_Assert(!pDevObject->hNodeMgr); status = NODE_CreateMgr(&pDevObject->hNodeMgr, hDevObject); - if (DSP_FAILED(status)) { - GT_1trace(debugMask, GT_7CLASS, - "DEV_Create2: NODE_CreateMgr failed, " - "0x%x!\n", status); + if (DSP_FAILED(status)) pDevObject->hNodeMgr = NULL; - GT_0trace(debugMask, GT_7CLASS, "DEV_Create2: Failed!!\n"); - } + DBC_Ensure((DSP_SUCCEEDED(status) && pDevObject->hNodeMgr != NULL) || (DSP_FAILED(status) && pDevObject->hNodeMgr == NULL)); return status; @@ -350,8 +328,6 @@ DSP_STATUS DEV_Destroy2(struct DEV_OBJECT *hDevObject) pDevObject->hNodeMgr = NULL; } - if (DSP_FAILED(status)) - GT_0trace(debugMask, GT_7CLASS, "DEV_Destroy2 failed!!\n"); DBC_Ensure((DSP_SUCCEEDED(status) && pDevObject->hNodeMgr == NULL) || DSP_FAILED(status)); @@ -433,7 +409,6 @@ DSP_STATUS DEV_DestroyDevice(struct DEV_OBJECT *hDevObject) pDevObject = NULL; } } else { - GT_0trace(debugMask, GT_7CLASS, "DEV_Destroy: Invlaid handle"); status = DSP_EHANDLE; } @@ -460,8 +435,6 @@ DSP_STATUS DEV_GetChnlMgr(struct DEV_OBJECT *hDevObject, } else { *phMgr = NULL; status = DSP_EHANDLE; - GT_0trace(debugMask, GT_7CLASS, - "DEV_GetChnlMgr: Invalid handle"); } DBC_Ensure(DSP_SUCCEEDED(status) || ((phMgr != NULL) && @@ -489,8 +462,6 @@ DSP_STATUS DEV_GetCmmMgr(struct DEV_OBJECT *hDevObject, } else { *phMgr = NULL; status = DSP_EHANDLE; - GT_0trace(debugMask, GT_7CLASS, - "DEV_GetCmmMgr: Invalid handle"); } DBC_Ensure(DSP_SUCCEEDED(status) || ((phMgr != NULL) && @@ -518,8 +489,6 @@ DSP_STATUS DEV_GetDmmMgr(struct DEV_OBJECT *hDevObject, } else { *phMgr = NULL; status = DSP_EHANDLE; - GT_0trace(debugMask, GT_7CLASS, - "DEV_GetDmmMgr: Invalid handle"); } DBC_Ensure(DSP_SUCCEEDED(status) || ((phMgr != NULL) && @@ -546,9 +515,6 @@ DSP_STATUS DEV_GetCodMgr(struct DEV_OBJECT *hDevObject, } else { *phCodMgr = NULL; status = DSP_EHANDLE; - GT_1trace(debugMask, GT_7CLASS, - "DEV_GetCodMgr, invalid handle: 0x%x\n", - hDevObject); } DBC_Ensure(DSP_SUCCEEDED(status) || ((phCodMgr != NULL) && @@ -572,8 +538,6 @@ DSP_STATUS DEV_GetDehMgr(struct DEV_OBJECT *hDevObject, } else { *phDehMgr = NULL; status = DSP_EHANDLE; - GT_0trace(debugMask, GT_7CLASS, - "DEV_GetDehMgr: Invalid handle"); } return status; } @@ -597,8 +561,6 @@ DSP_STATUS DEV_GetDevNode(struct DEV_OBJECT *hDevObject, } else { *phDevNode = NULL; status = DSP_EHANDLE; - GT_0trace(debugMask, GT_7CLASS, - "DEV_GetDevNode: Invalid handle"); } DBC_Ensure(DSP_SUCCEEDED(status) || ((phDevNode != NULL) && @@ -643,8 +605,6 @@ DSP_STATUS DEV_GetIntfFxns(struct DEV_OBJECT *hDevObject, } else { *ppIntfFxns = NULL; status = DSP_EHANDLE; - GT_0trace(debugMask, GT_7CLASS, - "DEV_GetIntDxns: Invalid handle"); } DBC_Ensure(DSP_SUCCEEDED(status) || ((ppIntfFxns != NULL) && @@ -669,7 +629,6 @@ DSP_STATUS DEV_GetIOMgr(struct DEV_OBJECT *hDevObject, } else { *phIOMgr = NULL; status = DSP_EHANDLE; - GT_0trace(debugMask, GT_7CLASS, "DEV_GetIOMgr: Invalid handle"); } return status; @@ -726,9 +685,6 @@ DSP_STATUS DEV_GetNodeManager(struct DEV_OBJECT *hDevObject, } else { *phNodeMgr = NULL; status = DSP_EHANDLE; - GT_1trace(debugMask, GT_7CLASS, - "DEV_GetNodeManager, invalid handle: 0x" - "%x\n", hDevObject); } DBC_Ensure(DSP_SUCCEEDED(status) || ((phNodeMgr != NULL) && @@ -757,8 +713,6 @@ DSP_STATUS DEV_GetSymbol(struct DEV_OBJECT *hDevObject, } } else { status = DSP_EHANDLE; - GT_0trace(debugMask, GT_7CLASS, - "DEV_GetSymbol: Invalid handle"); } return status; @@ -783,8 +737,6 @@ DSP_STATUS DEV_GetWMDContext(struct DEV_OBJECT *hDevObject, } else { *phWmdContext = NULL; status = DSP_EHANDLE; - GT_0trace(debugMask, GT_7CLASS, - "DEV_GetWMDContext: Invalid handle"); } DBC_Ensure(DSP_SUCCEEDED(status) || ((phWmdContext != NULL) && @@ -906,13 +858,11 @@ DSP_STATUS DEV_SetChnlMgr(struct DEV_OBJECT *hDevObject, struct CHNL_MGR *hMgr) DBC_Require(cRefs > 0); - if (IsValidHandle(hDevObject)) { + if (IsValidHandle(hDevObject)) pDevObject->hChnlMgr = hMgr; - } else { + else status = DSP_EHANDLE; - GT_0trace(debugMask, GT_7CLASS, - "DEV_SetChnlMgr, Invalid handle\n"); - } + DBC_Ensure(DSP_FAILED(status) || (pDevObject->hChnlMgr == hMgr)); return status; } @@ -950,15 +900,6 @@ DSP_STATUS DEV_StartDevice(struct CFG_DEVNODE *hDevNode) if (DSP_SUCCEEDED(status)) { /* Get DSP resources of device from Registry: */ status = CFG_GetDSPResources(hDevNode, &dspRes); - if (DSP_FAILED(status)) { - GT_1trace(debugMask, GT_7CLASS, - "Failed to get WMD DSP resources" - " from registry: 0x%x ", status); - } - } else { - GT_1trace(debugMask, GT_7CLASS, - "Failed to get WMD Host resources " - "from registry: 0x%x ", status); } if (DSP_SUCCEEDED(status)) { /* Given all resources, create a device object. */ @@ -969,16 +910,9 @@ DSP_STATUS DEV_StartDevice(struct CFG_DEVNODE *hDevNode) status = CFG_SetDevObject(hDevNode, (u32)hDevObject); if (DSP_FAILED(status)) { /* Clean up */ - GT_1trace(debugMask, GT_7CLASS, - "Failed to set DevObject in the " - "Registry: 0x%x", status); DEV_DestroyDevice(hDevObject); hDevObject = NULL; } - } else { - GT_1trace(debugMask, GT_7CLASS, - "Failed to Create Device: 0x%x", - status); } } if (DSP_SUCCEEDED(status)) { @@ -986,11 +920,6 @@ DSP_STATUS DEV_StartDevice(struct CFG_DEVNODE *hDevNode) status = MGR_Create(&hMgrObject, hDevNode); } if (DSP_FAILED(status)) { - GT_1trace(debugMask, GT_7CLASS, "Failed to MGR object: 0x%x", - status); - status = DSP_EFAIL; - } - if (DSP_FAILED(status)) { if (hDevObject) DEV_DestroyDevice(hDevObject); @@ -1012,9 +941,6 @@ DSP_STATUS DEV_StartDevice(struct CFG_DEVNODE *hDevNode) */ static DSP_STATUS FxnNotImplemented(int arg, ...) { - DBG_Trace(DBG_LEVEL1, - "WARNING: Calling a non-implemented WMD function.\n"); - return DSP_ENOTIMPL; } diff --git a/drivers/dsp/bridge/pmgr/dmm.c b/drivers/dsp/bridge/pmgr/dmm.c index 8dbcb77..ebecc8b 100644 --- a/drivers/dsp/bridge/pmgr/dmm.c +++ b/drivers/dsp/bridge/pmgr/dmm.c @@ -152,9 +152,6 @@ DSP_STATUS DMM_Create(OUT struct DMM_OBJECT **phDmmMgr, else DMM_Destroy(pDmmObject); } else { - GT_0trace(DMM_debugMask, GT_7CLASS, - "DMM_Create: Object Allocation " - "Failure(DMM Object)\n"); status = DSP_EMEMORY; } @@ -178,10 +175,7 @@ DSP_STATUS DMM_Destroy(struct DMM_OBJECT *hDmmMgr) /* Delete CS & dmm mgr object */ SYNC_DeleteCS(pDmmObj->hDmmLock); MEM_FreeObject(pDmmObj); - } else - GT_0trace(DMM_debugMask, GT_7CLASS, - "DMM_Destroy: DMM_DeleteTables " - "Failure\n"); + } } else status = DSP_EHANDLE; diff --git a/drivers/dsp/bridge/pmgr/io.c b/drivers/dsp/bridge/pmgr/io.c index e83178b..c6a4168 100644 --- a/drivers/dsp/bridge/pmgr/io.c +++ b/drivers/dsp/bridge/pmgr/io.c @@ -68,17 +68,11 @@ DSP_STATUS IO_Create(OUT struct IO_MGR **phIOMgr, struct DEV_OBJECT *hDevObject, *phIOMgr = NULL; /* A memory base of 0 implies no memory base: */ - if ((pMgrAttrs->dwSMBase != 0) && (pMgrAttrs->uSMLength == 0)) { + if ((pMgrAttrs->dwSMBase != 0) && (pMgrAttrs->uSMLength == 0)) status = CHNL_E_INVALIDMEMBASE; - GT_0trace(IO_DebugMask, GT_7CLASS, - "IO_Create:Invalid Mem Base\n"); - } - if (pMgrAttrs->uWordSize == 0) { + if (pMgrAttrs->uWordSize == 0) status = CHNL_E_INVALIDWORDSIZE; - GT_0trace(IO_DebugMask, GT_7CLASS, - "IO_Create:Invalid Word size\n"); - } if (DSP_SUCCEEDED(status)) { DEV_GetIntfFxns(hDevObject, &pIntfFxns); diff --git a/drivers/dsp/bridge/pmgr/wcd.c b/drivers/dsp/bridge/pmgr/wcd.c index 9f2bdf5..4b8ae3d 100644 --- a/drivers/dsp/bridge/pmgr/wcd.c +++ b/drivers/dsp/bridge/pmgr/wcd.c @@ -183,11 +183,8 @@ static inline void __cp_fm_usr(void *to, const void __user *from, return; } - if (unlikely(copy_from_user(to, from, bytes))) { - GT_2trace(WCD_debugMask, GT_7CLASS, - "%s failed, from=0x%08x\n", __func__, from); + if (unlikely(copy_from_user(to, from, bytes))) *err = DSP_EPOINTER; - } } #define cp_fm_usr(to, from, err, n) \ __cp_fm_usr(to, from, &(err), (n) * sizeof(*(to))) @@ -203,11 +200,8 @@ static inline void __cp_to_usr(void __user *to, const void *from, return; } - if (unlikely(copy_to_user(to, from, bytes))) { - GT_2trace(WCD_debugMask, GT_7CLASS, - "%s failed, to=0x%08x\n", __func__, to); + if (unlikely(copy_to_user(to, from, bytes))) *err = DSP_EPOINTER; - } } #define cp_to_usr(to, from, err, n) \ __cp_to_usr(to, from, &(err), (n) * sizeof(*(from))) @@ -411,15 +405,10 @@ DSP_STATUS WCD_InitComplete2(void) if ((devType == DSP_UNIT) || (devType == IVA_UNIT)) { if (DSP_FAILED(PROC_AutoStart(DevNode, hDevObject))) { - GT_0trace(WCD_debugMask, GT_1CLASS, - "WCD_InitComplete2 Failed\n"); status = DSP_EFAIL; /* break; */ } - } else - GT_1trace(WCD_debugMask, GT_ENTER, - "Ignoring PROC_AutoStart " - "for Device Type = 0x%x \n", devType); + } } /* End For Loop */ return status; -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 12/18] DSPBRIDGE: Remove excessive debug statements for services 2010-02-16 8:42 ` [PATCH 11/18] DSPBRIDGE: Remove excessive debug statements for pmgr Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 13/18] DSPBRIDGE: change init statements to pr_info in rmgr Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna Removed debug statements that print redundant errors where returned statuses should be enough in case of failure. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/services/cfg.c | 15 +----- drivers/dsp/bridge/services/mem.c | 13 ----- drivers/dsp/bridge/services/sync.c | 94 +++++++----------------------------- 3 files changed, 19 insertions(+), 103 deletions(-) diff --git a/drivers/dsp/bridge/services/cfg.c b/drivers/dsp/bridge/services/cfg.c index de2a7ab..f8c958a 100644 --- a/drivers/dsp/bridge/services/cfg.c +++ b/drivers/dsp/bridge/services/cfg.c @@ -73,11 +73,7 @@ DSP_STATUS CFG_GetAutoStart(struct CFG_DEVNODE *hDevNode, if (DSP_FAILED(status)) status = CFG_E_RESOURCENOTAVAIL; } -#ifdef CONFIG_BRIDGE_DEBUG - if (DSP_FAILED(status)) - GT_0trace(CFG_debugMask, GT_6CLASS, - "CFG_GetAutoStart Failed \n"); -#endif + DBC_Ensure((status == DSP_SOK && (*pdwAutoStart == 0 || *pdwAutoStart == 1)) || status != DSP_SOK); @@ -105,13 +101,9 @@ DSP_STATUS CFG_GetDevObject(struct CFG_DEVNODE *hDevNode, OUT u32 *pdwValue) /* check the device string and then call the REG_SetValue*/ if (!(strcmp((char *)((struct DRV_EXT *)hDevNode)->szString, - "TIOMAP1510"))) { + "TIOMAP1510"))) status = REG_GetValue("DEVICE_DSP", (u8 *)pdwValue, &dwBufSize); - } else { - GT_0trace(CFG_debugMask, GT_6CLASS, - "Failed to Identify the Device to Fetch \n"); - } } #ifdef CONFIG_BRIDGE_DEBUG if (DSP_FAILED(status)) @@ -302,9 +294,6 @@ DSP_STATUS CFG_SetDevObject(struct CFG_DEVNODE *hDevNode, u32 dwValue) if (!(strcmp((char *)hDevNode, "TIOMAP1510"))) { status = REG_SetValue("DEVICE_DSP", (u8 *)&dwValue, dwBuffSize); - } else { - GT_0trace(CFG_debugMask, GT_6CLASS, - "Failed to Register Device \n"); } } #ifdef CONFIG_BRIDGE_DEBUG diff --git a/drivers/dsp/bridge/services/mem.c b/drivers/dsp/bridge/services/mem.c index 189ebfc..65d268a 100644 --- a/drivers/dsp/bridge/services/mem.c +++ b/drivers/dsp/bridge/services/mem.c @@ -97,10 +97,6 @@ static void *MEM_ExtPhysMemAlloc(u32 bytes, u32 align, OUT u32 *pPhysAddr) if (bytes > ((extMemPool.physMemBase + extMemPool.physMemSize) - extMemPool.nextPhysAllocPtr)) { - GT_1trace(MEM_debugMask, GT_7CLASS, - "ExtPhysical Memory Allocation " - "unable to allocate memory for bytes = 0x%x \n", - bytes); pPhysAddr = NULL; return NULL; } else { @@ -147,9 +143,6 @@ void *MEM_Alloc(u32 cBytes, enum MEM_POOLATTRS type) break; default: - GT_0trace(MEM_debugMask, GT_6CLASS, - "MEM_Alloc: unexpected " - "MEM_POOLATTRS value\n"); break; } } @@ -176,9 +169,6 @@ void *MEM_AllocPhysMem(u32 cBytes, u32 ulAlign, OUT u32 *pPhysicalAddress) (in_atomic()) ? GFP_ATOMIC : GFP_KERNEL); if (pVaMem == NULL) { *pPhysicalAddress = 0; - GT_1trace(MEM_debugMask, GT_6CLASS, - "MEM_AllocPhysMem failed: " - "0x%x\n", pVaMem); } else { *pPhysicalAddress = paMem; } @@ -212,9 +202,6 @@ void *MEM_Calloc(u32 cBytes, enum MEM_POOLATTRS type) memset(pMem, 0, cBytes); break; default: - GT_1trace(MEM_debugMask, GT_6CLASS, - "MEM_Calloc: unexpected " - "MEM_POOLATTRS value 0x%x\n", type); break; } } diff --git a/drivers/dsp/bridge/services/sync.c b/drivers/dsp/bridge/services/sync.c index 9be4d8c..f9cd360 100644 --- a/drivers/dsp/bridge/services/sync.c +++ b/drivers/dsp/bridge/services/sync.c @@ -94,18 +94,13 @@ DSP_STATUS SYNC_CloseEvent(struct SYNC_OBJECT *hEvent) DBC_Require(pEvent != NULL && pEvent->pWaitObj == NULL); if (MEM_IsValidHandle(hEvent, SIGNATURE)) { - if (pEvent->pWaitObj) { + if (pEvent->pWaitObj) status = DSP_EFAIL; - GT_0trace(SYNC_debugMask, GT_6CLASS, - "SYNC_CloseEvent: Wait object not NULL\n"); - } + MEM_FreeObject(pEvent); } else { status = DSP_EHANDLE; - GT_1trace(SYNC_debugMask, GT_6CLASS, - "SYNC_CloseEvent: invalid " - "hEvent handle 0x%x\n", hEvent); } return status; @@ -154,8 +149,6 @@ DSP_STATUS SYNC_OpenEvent(OUT struct SYNC_OBJECT **phEvent, spin_lock_init(&pEvent->sync_lock); } else { status = DSP_EMEMORY; - GT_0trace(SYNC_debugMask, GT_6CLASS, - "SYNC_OpenEvent: MEM_AllocObject failed\n"); } *phEvent = pEvent; @@ -173,14 +166,10 @@ DSP_STATUS SYNC_ResetEvent(struct SYNC_OBJECT *hEvent) DSP_STATUS status = DSP_SOK; struct SYNC_OBJECT *pEvent = (struct SYNC_OBJECT *)hEvent; - if (MEM_IsValidHandle(hEvent, SIGNATURE)) { + if (MEM_IsValidHandle(hEvent, SIGNATURE)) pEvent->state = so_reset; - } else { + else status = DSP_EHANDLE; - GT_1trace(SYNC_debugMask, GT_6CLASS, - "SYNC_ResetEvent: invalid hEvent " - "handle 0x%x\n", hEvent); - } return status; } @@ -215,9 +204,6 @@ DSP_STATUS SYNC_SetEvent(struct SYNC_OBJECT *hEvent) spin_unlock_irqrestore(&hEvent->sync_lock, flags); } else { status = DSP_EHANDLE; - GT_1trace(SYNC_debugMask, GT_6CLASS, - "SYNC_SetEvent: invalid hEvent " - "handle 0x%x\n", hEvent); } return status; } @@ -234,15 +220,12 @@ DSP_STATUS SYNC_WaitOnEvent(struct SYNC_OBJECT *hEvent, u32 dwTimeout) struct SYNC_OBJECT *pEvent = (struct SYNC_OBJECT *)hEvent; u32 temp; - if (MEM_IsValidHandle(hEvent, SIGNATURE)) { + if (MEM_IsValidHandle(hEvent, SIGNATURE)) status = SYNC_WaitOnMultipleEvents(&pEvent, 1, dwTimeout, &temp); - } else { + else status = DSP_EHANDLE; - GT_1trace(SYNC_debugMask, GT_6CLASS, - "SYNC_WaitOnEvent: invalid hEvent" - "handle 0x%x\n", hEvent); - } + return status; } @@ -310,15 +293,9 @@ DSP_STATUS SYNC_WaitOnMultipleEvents(struct SYNC_OBJECT **hSyncEvents, } if (dwTimeout != SYNC_INFINITE) { if (in_interrupt()) { - if (!del_timer(&timeout)) { - GT_0trace(SYNC_debugMask, GT_7CLASS, - "SYNC: Timer expired\n"); - } + del_timer(&timeout); } else { - if (!del_timer_sync(&timeout)) { - GT_0trace(SYNC_debugMask, GT_7CLASS, - "SYNC: Timer expired\n"); - } + del_timer_sync(&timeout); } } } @@ -332,11 +309,8 @@ DSP_STATUS SYNC_WaitOnMultipleEvents(struct SYNC_OBJECT **hSyncEvents, *puIndex = i; } - if (Wp->signalling_event == NULL && DSP_SUCCEEDED(status)) { - GT_0trace(SYNC_debugMask, GT_7CLASS, - "SYNC:Signaling Event NULL!!!(:-\n"); + if (Wp->signalling_event == NULL && DSP_SUCCEEDED(status)) status = DSP_ETIMEOUT; - } kfree(Wp); return status; } @@ -358,28 +332,19 @@ DSP_STATUS SYNC_DeleteCS(struct SYNC_CSOBJECT *hCSObj) struct SYNC_CSOBJECT *pCSObj = (struct SYNC_CSOBJECT *)hCSObj; if (MEM_IsValidHandle(hCSObj, SIGNATURECS)) { - if (down_trylock(&pCSObj->sem) != 0) { - GT_1trace(SYNC_debugMask, GT_7CLASS, - "CS in use (locked) while " - "deleting! pCSObj=0x%X", pCSObj); + if (down_trylock(&pCSObj->sem) != 0) DBC_Assert(0); - } + MEM_FreeObject(hCSObj); } else if (MEM_IsValidHandle(hCSObj, SIGNATUREDPCCS)) { struct SYNC_DPCCSOBJECT *pDPCCSObj = (struct SYNC_DPCCSOBJECT *)hCSObj; - if (pDPCCSObj->count != 1) { - GT_1trace(SYNC_debugMask, GT_7CLASS, - "DPC CS in use (locked) while " - "deleting! pCSObj=0x%X", pCSObj); + if (pDPCCSObj->count != 1) DBC_Assert(0); - } + MEM_FreeObject(pDPCCSObj); } else { status = DSP_EHANDLE; - GT_1trace(SYNC_debugMask, GT_6CLASS, - "SYNC_DeleteCS: invalid hCSObj " - "handle 0x%x\n", hCSObj); } return status; @@ -396,14 +361,8 @@ DSP_STATUS SYNC_EnterCS(struct SYNC_CSOBJECT *hCSObj) if (MEM_IsValidHandle(hCSObj, SIGNATURECS)) { if (in_interrupt()) { status = DSP_EFAIL; - GT_0trace(SYNC_debugMask, GT_7CLASS, - "SYNC_EnterCS called from " - "ISR/DPC or with ISR/DPC disabled!"); DBC_Assert(0); } else if (down_interruptible(&pCSObj->sem)) { - GT_1trace(SYNC_debugMask, GT_7CLASS, - "CS interrupted by signal! " - "pCSObj=0x%X", pCSObj); status = DSP_EFAIL; } } else if (MEM_IsValidHandle(hCSObj, SIGNATUREDPCCS)) { @@ -413,17 +372,11 @@ DSP_STATUS SYNC_EnterCS(struct SYNC_CSOBJECT *hCSObj) pDPCCSObj->count--; if (pDPCCSObj->count != 0) { /* FATAL ERROR : Failed to acquire DPC CS */ - GT_2trace(SYNC_debugMask, GT_7CLASS, - "SYNC_EnterCS DPCCS %x locked," - "count %d", pDPCCSObj, pDPCCSObj->count); spin_unlock_bh(&pDPCCSObj->sync_dpccs_lock); DBC_Assert(0); } } else { status = DSP_EHANDLE; - GT_1trace(SYNC_debugMask, GT_6CLASS, - "SYNC_EnterCS: invalid hCSObj " - "handle 0x%x\n", hCSObj); } return status; @@ -439,14 +392,11 @@ DSP_STATUS SYNC_InitializeCS(OUT struct SYNC_CSOBJECT **phCSObj) /* Allocate memory for sync CS object */ MEM_AllocObject(pCSObj, struct SYNC_CSOBJECT, SIGNATURECS); - if (pCSObj != NULL) { + if (pCSObj != NULL) init_MUTEX(&pCSObj->sem); - } else { + else status = DSP_EMEMORY; - GT_0trace(SYNC_debugMask, GT_6CLASS, - "SYNC_InitializeCS: MEM_AllocObject" - "failed\n"); - } + /* return CS object */ *phCSObj = pCSObj; DBC_Assert(DSP_FAILED(status) || (pCSObj)); @@ -469,9 +419,6 @@ DSP_STATUS SYNC_InitializeDPCCS(OUT struct SYNC_CSOBJECT **phCSObj) spin_lock_init(&pCSObj->sync_dpccs_lock); } else { status = DSP_EMEMORY; - GT_0trace(SYNC_debugMask, GT_6CLASS, - "SYNC_InitializeDPCCS: " - "MEM_AllocObject failed\n"); } /* return CS object */ @@ -501,10 +448,6 @@ DSP_STATUS SYNC_LeaveCS(struct SYNC_CSOBJECT *hCSObj) pDPCCSObj->count++; if (pDPCCSObj->count != 1) { /* FATAL ERROR : Invalid DPC CS count */ - GT_2trace(SYNC_debugMask, GT_7CLASS, - "SYNC_LeaveCS DPCCS %x, " - "Invalid count %d", pDPCCSObj, - pDPCCSObj->count); spin_unlock_bh(&pDPCCSObj->sync_dpccs_lock); DBC_Assert(0); spin_lock_bh(&pDPCCSObj->sync_dpccs_lock); @@ -512,9 +455,6 @@ DSP_STATUS SYNC_LeaveCS(struct SYNC_CSOBJECT *hCSObj) spin_unlock_bh(&pDPCCSObj->sync_dpccs_lock); } else { status = DSP_EHANDLE; - GT_1trace(SYNC_debugMask, GT_6CLASS, - "SYNC_LeaveCS: invalid hCSObj " - "handle 0x%x\n", hCSObj); } return status; -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 13/18] DSPBRIDGE: change init statements to pr_info in rmgr 2010-02-16 8:42 ` [PATCH 12/18] DSPBRIDGE: Remove excessive debug statements for services Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 14/18] DSPBRIDGE: change critical error statements to pr_err " Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna Print to console if: - Driver is succesfully installed. - Baseimage is correctly loaded. - Processor is started. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/rmgr/drv_interface.c | 3 +-- drivers/dsp/bridge/rmgr/proc.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c index 8f9e626..a002e01 100644 --- a/drivers/dsp/bridge/rmgr/drv_interface.c +++ b/drivers/dsp/bridge/rmgr/drv_interface.c @@ -346,8 +346,7 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev) GT_0trace(driverTrace, GT_7CLASS, "DSP/BIOS Bridge initialization Failed\n"); } else { - GT_0trace(driverTrace, GT_5CLASS, - "DSP/BIOS Bridge driver loaded\n"); + pr_info("DSP Bridge driver loaded\n"); } } diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c index ed42a47..b6ed886 100644 --- a/drivers/dsp/bridge/rmgr/proc.c +++ b/drivers/dsp/bridge/rmgr/proc.c @@ -1030,8 +1030,7 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc, if (DSP_SUCCEEDED(status)) { if (DSP_SUCCEEDED((*pProcObject->pIntfFxns->pfnBrdStatus) (pProcObject->hWmdContext, &uBrdState))) { - GT_0trace(PROC_DebugMask, GT_1CLASS, - "PROC_Load: Processor Loaded\n"); + pr_info("%s: Processor Loaded %s\n", __func__, pargv0); DBC_Assert(uBrdState == BRD_LOADED); } } @@ -1289,8 +1288,7 @@ func_cont: if (DSP_SUCCEEDED(status)) { if (DSP_SUCCEEDED((*pProcObject->pIntfFxns->pfnBrdStatus) (pProcObject->hWmdContext, &uBrdState))) { - GT_0trace(PROC_DebugMask, GT_1CLASS, - "PROC_Start: Processor State is RUNNING \n"); + pr_info("%s: dsp in running state\n", __func__); DBC_Assert(uBrdState != BRD_HIBERNATION); } } -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 14/18] DSPBRIDGE: change critical error statements to pr_err in rmgr 2010-02-16 8:42 ` [PATCH 13/18] DSPBRIDGE: change init statements to pr_info in rmgr Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 15/18] DSPBRIDGE: change critical error statements to pr_err in wmd Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna Print to console if: - Driver is not succesfully installed. - Baseimage is not correctly loaded. - Processor can't be stopped or started. - Node can't be allocated, created, executed or deleted. This will help to quick diagnose most common bridge errors. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/rmgr/drv.c | 3 +- drivers/dsp/bridge/rmgr/drv_interface.c | 32 ++++------ drivers/dsp/bridge/rmgr/node.c | 98 +++++++++++------------------- drivers/dsp/bridge/rmgr/proc.c | 21 +++---- 4 files changed, 58 insertions(+), 96 deletions(-) diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c index c334f9e..44208b7 100644 --- a/drivers/dsp/bridge/rmgr/drv.c +++ b/drivers/dsp/bridge/rmgr/drv.c @@ -1165,8 +1165,7 @@ static DSP_STATUS RequestBridgeResourcesDSP(u32 dwContext, s32 bRequest) &dmaAddr); if (pResources->dwMemBase[1] == 0) { status = DSP_EMEMORY; - GT_0trace(curTrace, GT_7CLASS, - "SHM reservation Failed\n"); + pr_err("SHM reservation Failed\n"); } else { pResources->dwMemLength[1] = shm_size; pResources->dwMemPhys[1] = dmaAddr; diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c index a002e01..cff2877 100644 --- a/drivers/dsp/bridge/rmgr/drv_interface.c +++ b/drivers/dsp/bridge/rmgr/drv_interface.c @@ -232,8 +232,7 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev) /* use 2.6 device model */ result = alloc_chrdev_region(&dev, 0, 1, driver_name); if (result < 0) { - GT_1trace(driverTrace, GT_7CLASS, "bridge_init: " - "Can't get Major %d \n", driver_major); + pr_err("%s: Can't get major %d\n", __func__, driver_major); goto err1; } @@ -244,8 +243,7 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev) status = cdev_add(&bridge_cdev, dev, 1); if (status) { - GT_0trace(driverTrace, GT_7CLASS, - "Failed to add the bridge device \n"); + pr_err("%s: Failed to add bridge device\n", __func__); goto err2; } @@ -253,8 +251,7 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev) bridge_class = class_create(THIS_MODULE, "ti_bridge"); if (IS_ERR(bridge_class)) - GT_0trace(driverTrace, GT_7CLASS, - "Error creating bridge class \n"); + pr_err("%s: Error creating bridge class\n", __func__); device_create(bridge_class, NULL, MKDEV(driver_major, 0), NULL, "DspBridge"); @@ -298,8 +295,7 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev) } else { initStatus = DSP_EINVALIDARG; status = -1; - GT_0trace(driverTrace, GT_7CLASS, - "SHM size must be at least 64 KB\n"); + pr_err("%s: SHM size must be at least 64 KB\n", __func__); } GT_1trace(driverTrace, GT_7CLASS, "requested shm_size = 0x%x\n", shm_size); @@ -332,19 +328,16 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev) clk_handle = clk_get(NULL, "iva2_ck"); if (!clk_handle) - GT_0trace(driverTrace, GT_7CLASS, - "clk_get failed to get iva2_ck \n"); + pr_err("%s: clk_get failed to get iva2_ck\n", __func__); - if (clk_notifier_register(clk_handle, &iva_clk_notifier)) { - GT_0trace(driverTrace, GT_7CLASS, - "clk_notifier_register FAIL for iva2_ck \n"); - } + if (clk_notifier_register(clk_handle, &iva_clk_notifier)) + pr_err("%s: clk_notifier_register failed for iva2_ck\n", + __func__); #endif driverContext = DSP_Init(&initStatus); if (DSP_FAILED(initStatus)) { status = -1; - GT_0trace(driverTrace, GT_7CLASS, - "DSP/BIOS Bridge initialization Failed\n"); + pr_err("DSP Bridge driver initialization failed\n"); } else { pr_info("DSP Bridge driver loaded\n"); } @@ -373,10 +366,9 @@ static int __devexit omap34xx_bridge_remove(struct platform_device *pdev) goto func_cont; #ifdef CONFIG_BRIDGE_DVFS - if (clk_notifier_unregister(clk_handle, &iva_clk_notifier)) { - GT_0trace(driverTrace, GT_7CLASS, - "clk_notifier_unregister FAILED for iva2_ck \n"); - } + if (clk_notifier_unregister(clk_handle, &iva_clk_notifier)) + pr_err("%s: clk_notifier_unregister failed for iva2_ck\n", + __func__); #endif /* #ifdef CONFIG_BRIDGE_DVFS */ if (driverContext) { diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c index fe7d806..1c8b4a5 100644 --- a/drivers/dsp/bridge/rmgr/node.c +++ b/drivers/dsp/bridge/rmgr/node.c @@ -378,8 +378,7 @@ DSP_STATUS NODE_Allocate(struct PROC_OBJECT *hProcessor, /* Assuming that 0 is not a valid function address */ if (hNodeMgr->ulFxnAddrs[0] == 0) { /* No RMS on target - we currently can't handle this */ - GT_0trace(NODE_debugMask, GT_5CLASS, "No RMS functions in base " - "image. Node allocation fails.\n"); + pr_err("%s: Failed, no RMS in base image\n", __func__); status = DSP_EFAIL; } else { /* Validate pAttrIn fields, if non-NULL */ @@ -433,10 +432,8 @@ DSP_STATUS NODE_Allocate(struct PROC_OBJECT *hProcessor, /* check for page aligned Heap size */ if (((pAttrIn->uHeapSize) & (PG_SIZE_4K - 1))) { - GT_1trace(NODE_debugMask, GT_7CLASS, - "NODE_Allocate: node heap page size" - " not aligned to 4K page, size=0x%x \n", - pAttrIn->uHeapSize); + pr_err("%s: node heap size not aligned to 4K, size = 0x%x \n", + __func__, pAttrIn->uHeapSize); status = DSP_EINVALIDARG; } else { pNode->createArgs.asa.taskArgs.uHeapSize = pAttrIn->uHeapSize; @@ -451,10 +448,8 @@ DSP_STATUS NODE_Allocate(struct PROC_OBJECT *hProcessor, (void **)&(pNode->createArgs.asa.taskArgs. uDSPHeapResAddr)); if (DSP_FAILED(status)) { - GT_1trace(NODE_debugMask, GT_5CLASS, - "NODE_Allocate:Failed to reserve " - "memory for Heap: 0x%x\n", status); - + pr_err("%s: Failed to reserve memory for heap: 0x%x\n", + __func__, status); goto func_cont; } #ifdef DSP_DMM_DEBUG @@ -473,9 +468,8 @@ DSP_STATUS NODE_Allocate(struct PROC_OBJECT *hProcessor, (void *)pNode->createArgs.asa.taskArgs.uDSPHeapResAddr, (void **)&pMappedAddr, mapAttrs, pr_ctxt); if (DSP_FAILED(status)) - GT_1trace(NODE_debugMask, GT_5CLASS, - "NODE_Allocate: Failed to map memory" - " for Heap: 0x%x\n", status); + pr_err("%s: Failed to map memory for Heap: 0x%x\n", + __func__, status); else pNode->createArgs.asa.taskArgs.uDSPHeapAddr = (u32)pMappedAddr; @@ -590,28 +584,23 @@ func_cont: STACKSEGLABEL) == 0) { status = hNodeMgr->nldrFxns.pfnGetFxnAddr(pNode-> hNldrNode, "DYNEXT_BEG", &dynextBase); - if (DSP_FAILED(status)) { - GT_1trace(NODE_debugMask, GT_5CLASS, - "NODE_Allocate: Failed to get Address for " - "DYNEXT_BEG: 0x%x\n", status); - } + if (DSP_FAILED(status)) + pr_err("%s: Failed to get addr for DYNEXT_BEG" + " status = 0x%x\n", __func__, status); status = hNodeMgr->nldrFxns.pfnGetFxnAddr(pNode-> hNldrNode, "L1DSRAM_HEAP", &pulValue); - if (DSP_FAILED(status)) { - GT_1trace(NODE_debugMask, GT_5CLASS, - "NODE_Allocate: Failed to get Address for " - "L1DSRAM_HEAP: 0x%x\n", status); - } + if (DSP_FAILED(status)) + pr_err("%s: Failed to get addr for L1DSRAM_HEAP" + " status = 0x%x\n", __func__, status); status = CFG_GetHostResources((struct CFG_DEVNODE *) DRV_GetFirstDevExtension(), &hostRes); if (DSP_FAILED(status)) { - GT_1trace(NODE_debugMask, GT_5CLASS, - "NODE_Allocate: Failed to get host resource " - "0x%x\n", status); + pr_err("%s: Failed to get host resource, status" + " = 0x%x\n", __func__, status); goto func_end; } @@ -754,9 +743,8 @@ DBAPI NODE_AllocMsgBuf(struct NODE_OBJECT *hNode, u32 uSize, (void)CMM_XlatorAllocBuf(pNode->hXlator, pBuffer, uSize); if (*pBuffer == NULL) { - GT_0trace(NODE_debugMask, GT_7CLASS, - "NODE_AllocMsgBuf: " - "ERROR: Out of shared memory.\n"); + pr_err("%s: error - Out of shared memory\n", + __func__); status = DSP_EMEMORY; } } @@ -1219,9 +1207,8 @@ DSP_STATUS NODE_Create(struct NODE_OBJECT *hNode) CREATEPHASE); } } else { - GT_1trace(NODE_debugMask, GT_ENTER, - "NODE_Create: failed to load" - " create code: 0x%x\n", status); + pr_err("%s: failed to load create code: 0x%x\n", + __func__, status); } /* Request the lowest OPP level*/ #if defined(CONFIG_BRIDGE_DVFS) && !defined(CONFIG_CPU_FREQ) @@ -1263,11 +1250,9 @@ DSP_STATUS NODE_Create(struct NODE_OBJECT *hNode) NLDR_CREATE); hNode->fLoaded = false; } - if (DSP_FAILED(status1)) { - GT_1trace(NODE_debugMask, GT_5CLASS, - "NODE_Create: Failed to unload " - "create code: 0x%x\n", status1); - } + if (DSP_FAILED(status1)) + pr_err("%s: Failed to unload create code: 0x%x\n", + __func__, status1); func_cont2: /* Update node state and node manager state */ if (DSP_SUCCEEDED(status)) { @@ -1490,14 +1475,11 @@ DSP_STATUS NODE_Delete(struct NODE_OBJECT *hNode, hNode->fPhaseSplit) { status = hNodeMgr->nldrFxns.pfnLoad(hNode-> hNldrNode, NLDR_DELETE); - if (DSP_SUCCEEDED(status)) { + if (DSP_SUCCEEDED(status)) hNode->fLoaded = true; - } else { - GT_1trace(NODE_debugMask, GT_ENTER, - "NODE_Delete: failed to " - "load delete code: 0x%x\n", - status); - } + else + pr_err("%s: fail - load delete code:" + " 0x%x\n", __func__, status); } } func_cont1: @@ -1528,21 +1510,16 @@ func_cont1: status1 = hNodeMgr->nldrFxns.pfnUnload( hNode->hNldrNode, NLDR_EXECUTE); } - if (DSP_FAILED(status1)) { - GT_1trace(NODE_debugMask, GT_ENTER, - "NODE_Delete: failed to" - "unload execute code: 0x%x\n", - status1); - } + if (DSP_FAILED(status1)) + pr_err("%s: fail - unload execute code:" + " 0x%x\n", __func__, status1); + status1 = hNodeMgr->nldrFxns.pfnUnload( hNode->hNldrNode, NLDR_DELETE); hNode->fLoaded = false; - if (DSP_FAILED(status1)) { - GT_1trace(NODE_debugMask, GT_ENTER, - "NODE_Delete: failed to" - "unload delete code: 0x%x\n", - status1); - } + if (DSP_FAILED(status1)) + pr_err("%s: fail - unload delete code: " + "0x%x\n", __func__, status1); } } } @@ -2164,9 +2141,7 @@ DSP_STATUS NODE_PutMessage(struct NODE_OBJECT *hNode, /* MAUs */ newMsg.dwArg2 /= hNode->hNodeMgr->uDSPWordSize; } else { - GT_0trace(NODE_debugMask, GT_7CLASS, - "NODE_PutMessage: " - "uDSPWordSize is zero!\n"); + pr_err("%s: uDSPWordSize is zero!\n", __func__); status = DSP_EFAIL; /* bad DSPWordSize */ } } else { /* failed to translate buffer address */ @@ -2312,9 +2287,8 @@ DSP_STATUS NODE_Run(struct NODE_OBJECT *hNode) if (DSP_SUCCEEDED(status)) { hNode->fLoaded = true; } else { - GT_1trace(NODE_debugMask, GT_ENTER, - "NODE_Run: failed to load " - "execute code:0x%x\n", status); + pr_err("%s: fail - load execute code: 0x%x\n", + __func__, status); } } if (DSP_SUCCEEDED(status)) { diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c index b6ed886..f372059 100644 --- a/drivers/dsp/bridge/rmgr/proc.c +++ b/drivers/dsp/bridge/rmgr/proc.c @@ -977,8 +977,8 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc, "PROC_Load:Failure to Load the EXE\n"); } if (status == COD_E_SYMBOLNOTFOUND) { - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Load:Could not parse the file\n"); + pr_err("%s: Couldn't parse the file\n", + __func__); } } /* Requesting the lowest opp supported*/ @@ -1037,11 +1037,8 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc, #endif func_end: #ifdef CONFIG_BRIDGE_DEBUG - if (DSP_FAILED(status)) { - GT_0trace(PROC_DebugMask, GT_1CLASS, "PROC_Load: " - "Processor Load Failed.\n"); - - } + if (DSP_FAILED(status)) + pr_err("%s: Processor failed to load\n", __func__); #endif DBC_Ensure((DSP_SUCCEEDED(status) && pProcObject->sState == PROC_LOADED) || DSP_FAILED(status)); @@ -1291,6 +1288,8 @@ func_cont: pr_info("%s: dsp in running state\n", __func__); DBC_Assert(uBrdState != BRD_HIBERNATION); } + } else { + pr_err("%s: Failed to start the dsp\n", __func__); } #endif func_end: @@ -1332,9 +1331,8 @@ DSP_STATUS PROC_Stop(DSP_HPROCESSOR hProcessor) status = NODE_EnumNodes(hNodeMgr, &hNode, uNodeTabSize, &uNumNodes, &uNodesAllocated); if ((status == DSP_ESIZE) || (uNodesAllocated > 0)) { - GT_1trace(PROC_DebugMask, GT_7CLASS, - "Can't stop device, Active " - "nodes = 0x%x \n", uNodesAllocated); + pr_err("%s: Can't stop device, active nodes = %d \n", + __func__, uNodesAllocated); return DSP_EWRONGSTATE; } } @@ -1363,8 +1361,7 @@ DSP_STATUS PROC_Stop(DSP_HPROCESSOR hProcessor) #endif } } else { - GT_0trace(PROC_DebugMask, GT_7CLASS, - "PROC_Stop Failed to Stop the processor/device \n"); + pr_err("%s: Failed to stop the processor\n", __func__); } func_end: -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 15/18] DSPBRIDGE: change critical error statements to pr_err in wmd 2010-02-16 8:42 ` [PATCH 14/18] DSPBRIDGE: change critical error statements to pr_err " Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 16/18] DSPBRIDGE: print dsp trace buffer by default Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna Print to console: - SHM critical size errors. - PM power transition errors. - lack of MSG frame issues. This will help to quick diagnose most common bridge errors. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/wmd/io_sm.c | 19 +++++++++---------- drivers/dsp/bridge/wmd/tiomap3430.c | 8 ++++---- drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 6 +++--- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c index ab7607f..3471ed5 100644 --- a/drivers/dsp/bridge/wmd/io_sm.c +++ b/drivers/dsp/bridge/wmd/io_sm.c @@ -497,9 +497,9 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr) if ((ulSegSize + ulSeg1Size + ulPadSize) > hostRes.dwMemLength[1]) { - DBG_Trace(DBG_LEVEL7, "Insufficient SHM Reserved 0x%x. " - "Required 0x%x\n", hostRes.dwMemLength[1], - ulSegSize + ulSeg1Size + ulPadSize); + pr_err("%s: SHM Error, reserved 0x%x required 0x%x\n", + __func__, hostRes.dwMemLength[1], + ulSegSize + ulSeg1Size + ulPadSize); status = DSP_EMEMORY; } } @@ -905,10 +905,9 @@ static void IO_DispatchPM(struct work_struct *work) "command\n"); status = pIOMgr->pIntfFxns->pfnDevCntrl(pIOMgr-> hWmdContext, WMDIOCTL_PWR_HIBERNATE, pArg); - if (DSP_FAILED(status)) { - DBG_Trace(DBG_LEVEL7, "IO_DispatchPM : " - "Hibernation command failed\n"); - } + if (DSP_FAILED(status)) + pr_err("%s: hibernate cmd failed 0x%x\n", + __func__, status); } else if (pArg[0] == MBX_PM_OPP_REQ) { pArg[1] = pIOMgr->pSharedMem->oppRequest.rqstOppPt; DBG_Trace(DBG_LEVEL7, "IO_DispatchPM : Value of OPP " @@ -1355,9 +1354,9 @@ static void InputMsg(struct IO_MGR *pIOMgr, struct MSG_MGR *hMsgMgr) * No free frame to copy the * message into. */ - DBG_Trace(DBG_LEVEL7, "NO FREE " - "MSG FRAMES, DISCARDING" - " MESSAGE\n"); + pr_err("%s: no free msg frames," + " discarding msg\n", + __func__); } } break; diff --git a/drivers/dsp/bridge/wmd/tiomap3430.c b/drivers/dsp/bridge/wmd/tiomap3430.c index a8dbbfe..4563ca4 100644 --- a/drivers/dsp/bridge/wmd/tiomap3430.c +++ b/drivers/dsp/bridge/wmd/tiomap3430.c @@ -458,7 +458,7 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, /* Write a signature into the SHM base + offset; this will * get cleared when the DSP program starts. */ if ((ulShmBaseVirt == 0) || (ulShmBase == 0)) { - DBG_Trace(DBG_LEVEL6, "WMD_BRD_Start: Illegal SM base\n"); + pr_err("%s: Illegal SM base\n", __func__); status = DSP_EFAIL; } else *((volatile u32 *)dwSyncAddr) = 0xffffffff; @@ -1338,8 +1338,8 @@ static DSP_STATUS WMD_BRD_MemMap(struct WMD_DEV_CONTEXT *hDevContext, vma->vm_end, vma->vm_flags); } if (!vma) { - DBG_Trace(DBG_LEVEL7, "Failed to get the VMA region for " - "MPU Buffer !!! \n"); + pr_err("%s: Failed to get VMA region for 0x%x (%d)\n", + __func__, ulMpuAddr, ulNumBytes); status = DSP_EINVALIDARG; up_read(&mm->mmap_sem); goto func_cont; @@ -1923,7 +1923,7 @@ bool WaitForStart(struct WMD_DEV_CONTEXT *pDevContext, u32 dwSyncAddr) /* If timed out: return FALSE */ if (!timeout) { - DBG_Trace(DBG_LEVEL7, "Timed out Waiting for DSP to Start\n"); + pr_err("%s: Timed out waiting DSP to Start\n", __func__); return FALSE; } return TRUE; diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c index 270655a..9469c5e 100644 --- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c +++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c @@ -117,7 +117,7 @@ DSP_STATUS handle_hibernation_fromDSP(struct WMD_DEV_CONTEXT *pDevContext) &pwrState); } if (timeout == 0) { - DBG_Trace(DBG_LEVEL7, "Timed out Waiting for DSP Off mode \n"); + pr_err("%s: Timed out waiting for DSP off mode\n", __func__); status = WMD_E_TIMEOUT; return status; } else { @@ -232,8 +232,8 @@ DSP_STATUS SleepDSP(struct WMD_DEV_CONTEXT *pDevContext, IN u32 dwCmd, } if (!timeout) { - DBG_Trace(DBG_LEVEL7, "SleepDSP: Timed out Waiting for DSP" - " STANDBY %x \n", pwrState); + pr_err("%s: Timed out waiting for DSP off mode, state %x\n", + __func__, pwrState); #ifdef CONFIG_BRIDGE_NTFY_PWRERR DEV_GetDehMgr(pDevContext->hDevObject, &hDehMgr); WMD_DEH_Notify(hDehMgr, DSP_PWRERROR, 0); -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 16/18] DSPBRIDGE: print dsp trace buffer by default 2010-02-16 8:42 ` [PATCH 15/18] DSPBRIDGE: change critical error statements to pr_err in wmd Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 17/18] DSPBRIDGE: change critical error statements to pr_err in pmgr Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna Print to console if the contents of the dsp trace buffer. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/wmd/io_sm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c index 3471ed5..e9de3fc 100644 --- a/drivers/dsp/bridge/wmd/io_sm.c +++ b/drivers/dsp/bridge/wmd/io_sm.c @@ -2010,8 +2010,7 @@ DSP_STATUS PrintDspTraceBuffer(struct WMD_DEV_CONTEXT *hWmdContext) if (DSP_SUCCEEDED(status)) { /* Pack and do newline conversion */ PackTraceBuffer(pszBuf, ulNumBytes, ulNumWords); - GT_1trace(dsp_trace_mask, GT_1CLASS, - "DSP Trace Buffer:\n%s\n", pszBuf); + pr_info("%s:\n%s\n", __func__, pszBuf); } kfree(pszBuf); kfree(lpszBuf); -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 17/18] DSPBRIDGE: change critical error statements to pr_err in pmgr 2010-02-16 8:42 ` [PATCH 16/18] DSPBRIDGE: print dsp trace buffer by default Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 18/18] DSPBRIDGE: change critical error statements to pr_err in services Omar Ramirez Luna 0 siblings, 1 reply; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna Print to console: - DMM table creation fails. - Failure while finding dsp code. - Failure on device create This will help to quick diagnose most common bridge errors. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/pmgr/cod.c | 14 ++++++-------- drivers/dsp/bridge/pmgr/dev.c | 5 ++--- drivers/dsp/bridge/pmgr/dmm.c | 8 ++++---- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/dsp/bridge/pmgr/cod.c b/drivers/dsp/bridge/pmgr/cod.c index eb74fb8..541503c 100644 --- a/drivers/dsp/bridge/pmgr/cod.c +++ b/drivers/dsp/bridge/pmgr/cod.c @@ -574,10 +574,6 @@ DSP_STATUS COD_Open(struct COD_MANAGER *hMgr, IN char *pszCoffPath, DBC_Require(flags == COD_NOLOAD || flags == COD_SYMB); DBC_Require(pLib != NULL); - GT_4trace(COD_debugMask, GT_ENTER, "Entered COD_Open, hMgr: 0x%x\n\t " - "pszCoffPath: 0x%x\tflags: 0x%x\tlib: 0x%x\n", hMgr, - pszCoffPath, flags, pLib); - *pLib = NULL; lib = MEM_Calloc(sizeof(struct COD_LIBRARYOBJ), MEM_NONPAGED); @@ -592,6 +588,9 @@ DSP_STATUS COD_Open(struct COD_MANAGER *hMgr, IN char *pszCoffPath, *pLib = lib; } + if (DSP_FAILED(status)) + pr_err("%s: error status 0x%x, pszCoffPath: %s flags: 0x%x\n", + __func__, status, pszCoffPath, flags); return status; } @@ -610,10 +609,6 @@ DSP_STATUS COD_OpenBase(struct COD_MANAGER *hMgr, IN char *pszCoffPath, DBC_Require(IsValid(hMgr)); DBC_Require(pszCoffPath != NULL); - GT_2trace(COD_debugMask, GT_ENTER, - "Entered COD_OpenBase, hMgr: 0x%x\n\t" - "pszCoffPath: 0x%x\n", hMgr, pszCoffPath); - /* if we previously opened a base image, close it now */ if (hMgr->baseLib) { if (hMgr->fLoaded) { @@ -631,6 +626,9 @@ DSP_STATUS COD_OpenBase(struct COD_MANAGER *hMgr, IN char *pszCoffPath, hMgr->szZLFile[COD_MAXPATHLENGTH - 1] = '\0'; } + if (DSP_FAILED(status)) + pr_err("%s: error status 0x%x pszCoffPath: %s\n", __func__, + status, pszCoffPath); return status; } diff --git a/drivers/dsp/bridge/pmgr/dev.c b/drivers/dsp/bridge/pmgr/dev.c index 8ee6d69..e4450bc 100644 --- a/drivers/dsp/bridge/pmgr/dev.c +++ b/drivers/dsp/bridge/pmgr/dev.c @@ -215,9 +215,8 @@ DSP_STATUS DEV_CreateDevice(OUT struct DEV_OBJECT **phDevObject, } else { ioMgrAttrs.dwSMBase = 0; ioMgrAttrs.uSMLength = 0; - GT_0trace(debugMask, GT_7CLASS, - "**There is no memory reserved for " - "shared structures**\n"); + pr_err("%s: No memory reserved for shared structures\n", + __func__); } status = CHNL_Create(&pDevObject->hChnlMgr, pDevObject, &mgrAttrs); diff --git a/drivers/dsp/bridge/pmgr/dmm.c b/drivers/dsp/bridge/pmgr/dmm.c index ebecc8b..2840674 100644 --- a/drivers/dsp/bridge/pmgr/dmm.c +++ b/drivers/dsp/bridge/pmgr/dmm.c @@ -120,10 +120,10 @@ DSP_STATUS DMM_CreateTables(struct DMM_OBJECT *hDmmMgr, u32 addr, u32 size) pVirtualMappingTable[0].RegionSize = TableSize; } SYNC_LeaveCS(pDmmObj->hDmmLock); - } else - GT_0trace(DMM_debugMask, GT_7CLASS, - "DMM_CreateTables: DMM_DeleteTables" - "Failure\n"); + } + + if (DSP_FAILED(status)) + pr_err("%s: failure, status 0x%x\n", __func__, status); return status; } -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 18/18] DSPBRIDGE: change critical error statements to pr_err in services 2010-02-16 8:42 ` [PATCH 17/18] DSPBRIDGE: change critical error statements to pr_err in pmgr Omar Ramirez Luna @ 2010-02-16 8:42 ` Omar Ramirez Luna 0 siblings, 0 replies; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-16 8:42 UTC (permalink / raw) To: linux-omap Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon, Omar Ramirez Luna Print to console: - If extern phys_mem_pool map fails. - Clk bridge module failures. - Cfg bridge module failures. This will help to quick diagnose most common bridge errors. Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com> --- drivers/dsp/bridge/services/cfg.c | 21 ++++++++------------- drivers/dsp/bridge/services/clk.c | 23 +++++++++-------------- drivers/dsp/bridge/services/mem.c | 4 +--- 3 files changed, 18 insertions(+), 30 deletions(-) diff --git a/drivers/dsp/bridge/services/cfg.c b/drivers/dsp/bridge/services/cfg.c index f8c958a..d26f8b9 100644 --- a/drivers/dsp/bridge/services/cfg.c +++ b/drivers/dsp/bridge/services/cfg.c @@ -107,8 +107,7 @@ DSP_STATUS CFG_GetDevObject(struct CFG_DEVNODE *hDevNode, OUT u32 *pdwValue) } #ifdef CONFIG_BRIDGE_DEBUG if (DSP_FAILED(status)) - GT_0trace(CFG_debugMask, GT_6CLASS, - "CFG_GetDevObject Failed \n"); + pr_err("%s: Failed, status 0x%x\n", __func__, status); #endif return status; } @@ -134,8 +133,7 @@ DSP_STATUS CFG_GetDSPResources(struct CFG_DEVNODE *hDevNode, } if (DSP_FAILED(status)) { status = CFG_E_RESOURCENOTAVAIL; - GT_0trace(CFG_debugMask, GT_6CLASS, - "CFG_GetDSPResources Failed \n"); + pr_err("%s: Failed, status 0x%x\n", __func__, status); } #ifdef CONFIG_BRIDGE_DEBUG /* assert that resource values are reasonable */ @@ -174,8 +172,7 @@ DSP_STATUS CFG_GetExecFile(struct CFG_DEVNODE *hDevNode, u32 ulBufSize, } #ifdef CONFIG_BRIDGE_DEBUG if (DSP_FAILED(status)) - GT_0trace(CFG_debugMask, GT_6CLASS, - "CFG_GetExecFile Failed \n"); + pr_err("%s: Failed, status 0x%x\n", __func__, status); #endif DBC_Ensure(((status == DSP_SOK) && (strlen(pstrExecFile) <= ulBufSize)) || (status != DSP_SOK)); @@ -242,7 +239,7 @@ DSP_STATUS CFG_GetObject(OUT u32 *pdwValue, u32 dwType) } if (DSP_FAILED(status)) { *pdwValue = 0; - GT_0trace(CFG_debugMask, GT_6CLASS, "CFG_GetObject Failed \n"); + pr_err("%s: Failed, status 0x%x\n", __func__, status); } DBC_Ensure((DSP_SUCCEEDED(status) && *pdwValue != 0) || (DSP_FAILED(status) && *pdwValue == 0)); @@ -268,9 +265,8 @@ bool CFG_Init(void) dspResources.aMemDesc[0].ulMax = 0; if (DSP_FAILED(REG_SetValue(DSPRESOURCES, (u8 *)&dspResources, sizeof(struct CFG_DSPRES)))) - GT_0trace(CFG_debugMask, GT_5CLASS, - "Failed to Initialize DSP resources" - " in Registry \n"); + pr_err("Failed to initialize DSP resources in registry\n"); + return true; } @@ -298,8 +294,7 @@ DSP_STATUS CFG_SetDevObject(struct CFG_DEVNODE *hDevNode, u32 dwValue) } #ifdef CONFIG_BRIDGE_DEBUG if (DSP_FAILED(status)) - GT_0trace(CFG_debugMask, GT_6CLASS, - "CFG_SetDevObject Failed \n"); + pr_err("%s: Failed, status 0x%x\n", __func__, status); #endif return status; } @@ -327,7 +322,7 @@ DSP_STATUS CFG_SetObject(u32 dwValue, u32 dwType) } #ifdef CONFIG_BRIDGE_DEBUG if (DSP_FAILED(status)) - GT_0trace(CFG_debugMask, GT_6CLASS, "CFG_SetObject Failed \n"); + pr_err("%s: Failed, status 0x%x\n", __func__, status); #endif return status; } diff --git a/drivers/dsp/bridge/services/clk.c b/drivers/dsp/bridge/services/clk.c index 1e8fe45..f8c417a 100644 --- a/drivers/dsp/bridge/services/clk.c +++ b/drivers/dsp/bridge/services/clk.c @@ -138,10 +138,8 @@ bool CLK_Init(void) SERVICES_Clks[i].clk_name); if (!clk_handle) { - GT_2trace(CLK_debugMask, GT_7CLASS, - "CLK_Init: failed to get Clk handle %s, " - "CLK dev id = %d\n", - SERVICES_Clks[i].clk_name, + pr_err("%s: failed to get clk handle %s, dev id = %d\n", + __func__, SERVICES_Clks[i].clk_name, SERVICES_Clks[i].id); /* should we fail here?? */ } @@ -208,8 +206,7 @@ DSP_STATUS CLK_Set_32KHz(IN enum SERVICES_ClkId clk_id) pClk = SERVICES_Clks[clk_id].clk_handle; if (pClk) { if (!(clk_set_parent(pClk, pClkParent) == 0x0)) { - GT_2trace(CLK_debugMask, GT_7CLASS, "CLK_Set_32KHz: " - "Failed to set to 32KHz %s, CLK dev id = %s\n", + pr_err("%s: failed for %s, dev id = %d\n", __func__, SERVICES_Clks[clk_id].clk_name, SERVICES_Clks[clk_id].id); status = DSP_EFAIL; @@ -282,10 +279,9 @@ DSP_STATUS CLK_GetRate(IN enum SERVICES_ClkId clk_id, u32 *speedKhz) "CLK_GetRate: clkSpeedHz = %d , " "speedinKhz=%d\n", clkSpeedHz, *speedKhz); } else { - GT_2trace(CLK_debugMask, GT_7CLASS, - "CLK_GetRate: failed to get CLK %s, " - "CLK dev Id = %d\n", SERVICES_Clks[clk_id].clk_name, - SERVICES_Clks[clk_id].id); + pr_err("%s: failed to get %s, dev Id = %d\n", __func__, + SERVICES_Clks[clk_id].clk_name, + SERVICES_Clks[clk_id].id); status = DSP_EFAIL; } return status; @@ -304,10 +300,9 @@ s32 CLK_Get_UseCnt(IN enum SERVICES_ClkId clk_id) /* FIXME: usecount shouldn't be used */ useCount = pClk->usecount; } else { - GT_2trace(CLK_debugMask, GT_7CLASS, - "CLK_GetRate: failed to get CLK %s, " - "CLK dev Id = %d\n", SERVICES_Clks[clk_id].clk_name, - SERVICES_Clks[clk_id].id); + pr_err("%s: failed to get %s, dev Id = %d\n", __func__, + SERVICES_Clks[clk_id].clk_name, + SERVICES_Clks[clk_id].id); status = DSP_EFAIL; } return useCount; diff --git a/drivers/dsp/bridge/services/mem.c b/drivers/dsp/bridge/services/mem.c index 65d268a..092b532 100644 --- a/drivers/dsp/bridge/services/mem.c +++ b/drivers/dsp/bridge/services/mem.c @@ -59,9 +59,7 @@ void MEM_ExtPhysPoolInit(u32 poolPhysBase, u32 poolSize) poolVirtBase = (u32)ioremap(poolPhysBase, poolSize); if ((void **)poolVirtBase == NULL) { - GT_0trace(MEM_debugMask, GT_7CLASS, - "[PHYS_POOL]Mapping External " - "physical memory to virt failed \n"); + pr_err("%s: external physical memory map failed\n", __func__); extPhysMemPoolEnabled = false; } else { extMemPool.physMemBase = poolPhysBase; -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 00/18] Custom debug cleanup 2010-02-16 8:42 [PATCH 00/18] Custom debug cleanup Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 01/18] DSPBRIDGE: Remove entry point custom debug statements for rmgr Omar Ramirez Luna @ 2010-02-23 17:53 ` Omar Ramirez Luna 1 sibling, 0 replies; 20+ messages in thread From: Omar Ramirez Luna @ 2010-02-23 17:53 UTC (permalink / raw) To: Ramirez Luna, Omar Cc: linux-omap, Ameya Palande, Hiroshi Doyu, Felipe Contreras, Menon, Nishanth On 2/16/2010 2:42 AM, Ramirez Luna, Omar wrote: > Step 1 to remove custom debug tracing > > Omar Ramirez Luna (18): > DSPBRIDGE: Remove entry point custom debug statements for rmgr > DSPBRIDGE: Remove entry point custom debug statements for wmd > DSPBRIDGE: Remove entry point custom debug statements for pmgr > DSPBRIDGE: Remove entry point custom debug statements for wmd > DSPBRIDGE: Remove debug statements for success in rmgr > DSPBRIDGE: Remove debug statements for success in wmd > DSPBRIDGE: Remove debug statements for success in pmgr > DSPBRIDGE: Remove debug statements for success in services > DSPBRIDGE: Remove excessive debug statements for rmgr > DSPBRIDGE: Remove excessive debug statements for wmd > DSPBRIDGE: Remove excessive debug statements for pmgr > DSPBRIDGE: Remove excessive debug statements for services > DSPBRIDGE: change init statements to pr_info in rmgr > DSPBRIDGE: change critical error statements to pr_err in rmgr > DSPBRIDGE: change critical error statements to pr_err in wmd > DSPBRIDGE: print dsp trace buffer by default > DSPBRIDGE: change critical error statements to pr_err in pmgr > DSPBRIDGE: change critical error statements to pr_err in services > > drivers/dsp/bridge/pmgr/chnl.c | 43 +--- > drivers/dsp/bridge/pmgr/cmm.c | 87 +------ > drivers/dsp/bridge/pmgr/cod.c | 107 ++------- > drivers/dsp/bridge/pmgr/dbll.c | 59 +---- > drivers/dsp/bridge/pmgr/dev.c | 238 ++---------------- > drivers/dsp/bridge/pmgr/dmm.c | 54 +---- > drivers/dsp/bridge/pmgr/io.c | 34 +--- > drivers/dsp/bridge/pmgr/msg.c | 15 +- > drivers/dsp/bridge/pmgr/wcd.c | 139 +---------- > drivers/dsp/bridge/rmgr/dbdcd.c | 122 +--------- > drivers/dsp/bridge/rmgr/disp.c | 143 +---------- > drivers/dsp/bridge/rmgr/drv.c | 166 +++----------- > drivers/dsp/bridge/rmgr/drv_interface.c | 62 ++---- > drivers/dsp/bridge/rmgr/dspdrv.c | 22 +-- > drivers/dsp/bridge/rmgr/mgr.c | 75 +----- > drivers/dsp/bridge/rmgr/nldr.c | 57 +---- > drivers/dsp/bridge/rmgr/node.c | 295 +++++------------------ > drivers/dsp/bridge/rmgr/proc.c | 407 ++++--------------------------- > drivers/dsp/bridge/rmgr/rmm.c | 35 +--- > drivers/dsp/bridge/rmgr/strm.c | 84 +------ > drivers/dsp/bridge/services/cfg.c | 134 ++-------- > drivers/dsp/bridge/services/clk.c | 49 +--- > drivers/dsp/bridge/services/dbg.c | 4 +- > drivers/dsp/bridge/services/mem.c | 51 +---- > drivers/dsp/bridge/services/ntfy.c | 4 +- > drivers/dsp/bridge/services/reg.c | 10 - > drivers/dsp/bridge/services/services.c | 3 - > drivers/dsp/bridge/services/sync.c | 151 ++---------- > drivers/dsp/bridge/wmd/chnl_sm.c | 37 +--- > drivers/dsp/bridge/wmd/io_sm.c | 130 ++--------- > drivers/dsp/bridge/wmd/mmu_fault.c | 9 - > drivers/dsp/bridge/wmd/tiomap3430.c | 208 +++------------- > drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 70 +----- > drivers/dsp/bridge/wmd/tiomap_io.c | 58 +---- > drivers/dsp/bridge/wmd/tiomap_sm.c | 6 - > drivers/dsp/bridge/wmd/ue_deh.c | 29 +-- > 36 files changed, 418 insertions(+), 2779 deletions(-) > Rebased and pushed to dspbridge - omar ^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2010-02-23 17:53 UTC | newest] Thread overview: 20+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-02-16 8:42 [PATCH 00/18] Custom debug cleanup Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 01/18] DSPBRIDGE: Remove entry point custom debug statements for rmgr Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 02/18] DSPBRIDGE: Remove entry point custom debug statements for wmd Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 03/18] DSPBRIDGE: Remove entry point custom debug statements for pmgr Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 04/18] DSPBRIDGE: Remove entry point custom debug statements for wmd Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 05/18] DSPBRIDGE: Remove debug statements for success in rmgr Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 06/18] DSPBRIDGE: Remove debug statements for success in wmd Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 07/18] DSPBRIDGE: Remove debug statements for success in pmgr Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 08/18] DSPBRIDGE: Remove debug statements for success in services Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 09/18] DSPBRIDGE: Remove excessive debug statements for rmgr Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 10/18] DSPBRIDGE: Remove excessive debug statements for wmd Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 11/18] DSPBRIDGE: Remove excessive debug statements for pmgr Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 12/18] DSPBRIDGE: Remove excessive debug statements for services Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 13/18] DSPBRIDGE: change init statements to pr_info in rmgr Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 14/18] DSPBRIDGE: change critical error statements to pr_err " Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 15/18] DSPBRIDGE: change critical error statements to pr_err in wmd Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 16/18] DSPBRIDGE: print dsp trace buffer by default Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 17/18] DSPBRIDGE: change critical error statements to pr_err in pmgr Omar Ramirez Luna 2010-02-16 8:42 ` [PATCH 18/18] DSPBRIDGE: change critical error statements to pr_err in services Omar Ramirez Luna 2010-02-23 17:53 ` [PATCH 00/18] Custom debug cleanup Omar Ramirez Luna
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.