Custom debug cleanup
cover Custom debug cleanup
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(-)
PATCH 1/18 DSPBRIDGE: Remove entry point custom debug statements for rmgr
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--- 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(-)
drivers/dsp/bridge/rmgr/dbdcd.c +0 -44
@@ -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) {
drivers/dsp/bridge/rmgr/disp.c +0 -35
@@ -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)) {
drivers/dsp/bridge/rmgr/drv.c +22 -80
285 lines not on this page · raw message
drivers/dsp/bridge/rmgr/drv_interface.c +0 -14
@@ -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; }
drivers/dsp/bridge/rmgr/dspdrv.c +0 -4
@@ -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);
drivers/dsp/bridge/rmgr/mgr.c +2 -31
@@ -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;
drivers/dsp/bridge/rmgr/nldr.c +4 -25
@@ -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) {
drivers/dsp/bridge/rmgr/node.c +6 -43
136 lines not on this page · raw message
drivers/dsp/bridge/rmgr/proc.c +3 -71
230 lines not on this page · raw message
drivers/dsp/bridge/rmgr/rmm.c +0 -20
@@ -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; }
drivers/dsp/bridge/rmgr/strm.c +0 -28
@@ -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 )) {
Signature · 1 line
1.6.2.4
PATCH 2/18 DSPBRIDGE: Remove entry point custom debug statements for wmd
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.
--- 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(-)
drivers/dsp/bridge/wmd/chnl_sm.c +0 -10
@@ -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; }
drivers/dsp/bridge/wmd/io_sm.c +2 -15
@@ -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);
drivers/dsp/bridge/wmd/mmu_fault.c +0 -4
@@ -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 ));
drivers/dsp/bridge/wmd/tiomap3430.c +4 -45
181 lines not on this page · raw message
drivers/dsp/bridge/wmd/tiomap3430_pwr.c +0 -5
@@ -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);
drivers/dsp/bridge/wmd/tiomap_io.c +0 -9
@@ -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,
drivers/dsp/bridge/wmd/tiomap_sm.c +0 -6
@@ -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);
drivers/dsp/bridge/wmd/ue_deh.c +3 -16
@@ -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; }
Signature · 1 line
1.6.2.4
PATCH 3/18 DSPBRIDGE: Remove entry point custom debug statements for pmgr
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.
--- 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(-)
drivers/dsp/bridge/pmgr/chnl.c +0 -20
@@ -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;
drivers/dsp/bridge/pmgr/cmm.c +2 -14
@@ -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 */
drivers/dsp/bridge/pmgr/cod.c +1 -29
@@ -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,
drivers/dsp/bridge/pmgr/dbll.c +1 -16
@@ -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;
drivers/dsp/bridge/pmgr/dev.c +18 -119
390 lines not on this page · raw message
drivers/dsp/bridge/pmgr/dmm.c +1 -37
@@ -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;
drivers/dsp/bridge/pmgr/io.c +0 -21
@@ -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;
drivers/dsp/bridge/pmgr/msg.c +1 -12
@@ -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;
drivers/dsp/bridge/pmgr/wcd.c +4 -118
356 lines not on this page · raw message
Signature · 1 line
1.6.2.4
PATCH 4/18 DSPBRIDGE: Remove entry point custom debug statements for wmd
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.
--- 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(-)
drivers/dsp/bridge/services/cfg.c +9 -29
@@ -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 ):
drivers/dsp/bridge/services/clk.c +1 -15
@@ -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);
drivers/dsp/bridge/services/dbg.c +1 -3
@@ -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 */
drivers/dsp/bridge/services/mem.c +0 -13
@@ -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);
drivers/dsp/bridge/services/ntfy.c +1 -3
@@ -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; }
drivers/dsp/bridge/services/reg.c +0 -10
@@ -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; }
drivers/dsp/bridge/services/services.c +0 -3
@@ -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 ();
drivers/dsp/bridge/services/sync.c +1 -36
@@ -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 )) {
Signature · 1 line
1.6.2.4
PATCH 5/18 DSPBRIDGE: Remove debug statements for success in rmgr
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.
--- 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(-)
drivers/dsp/bridge/rmgr/dbdcd.c +1 -13
@@ -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" );
drivers/dsp/bridge/rmgr/disp.c +1 -5
@@ -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;
drivers/dsp/bridge/rmgr/drv.c +6 -39
106 lines not on this page · raw message
drivers/dsp/bridge/rmgr/drv_interface.c +4 -13
@@ -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" ); }
drivers/dsp/bridge/rmgr/dspdrv.c +1 -8
@@ -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 */
drivers/dsp/bridge/rmgr/mgr.c +0 -2
@@ -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 "
drivers/dsp/bridge/rmgr/node.c +11 -49
126 lines not on this page · raw message
drivers/dsp/bridge/rmgr/proc.c +5 -37
112 lines not on this page · raw message
Signature · 1 line
1.6.2.4
PATCH 6/18 DSPBRIDGE: Remove debug statements for success in wmd
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.
--- 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(-)
drivers/dsp/bridge/wmd/chnl_sm.c +0 -4
@@ -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,
drivers/dsp/bridge/wmd/io_sm.c +5 -41
152 lines not on this page · raw message
drivers/dsp/bridge/wmd/mmu_fault.c +0 -5
@@ -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;
drivers/dsp/bridge/wmd/tiomap3430.c +13 -61
238 lines not on this page · raw message
drivers/dsp/bridge/wmd/tiomap3430_pwr.c +2 -25
@@ -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 ) {
drivers/dsp/bridge/wmd/tiomap_io.c +3 -19
@@ -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,
drivers/dsp/bridge/wmd/ue_deh.c +0 -7
@@ -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,
Signature · 1 line
1.6.2.4
PATCH 7/18 DSPBRIDGE: Remove debug statements for success in pmgr
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.
--- 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(-)
drivers/dsp/bridge/pmgr/chnl.c +0 -3
@@ -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); } }
drivers/dsp/bridge/pmgr/cmm.c +1 -14
@@ -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; }
drivers/dsp/bridge/pmgr/cod.c +0 -6
@@ -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)) {
drivers/dsp/bridge/pmgr/dbll.c +1 -15
@@ -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 */
drivers/dsp/bridge/pmgr/dev.c +0 -8
@@ -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;
drivers/dsp/bridge/pmgr/io.c +0 -3
@@ -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); } }
drivers/dsp/bridge/pmgr/msg.c +0 -2
@@ -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 ; }
Signature · 1 line
1.6.2.4
PATCH 8/18 DSPBRIDGE: Remove debug statements for success in services
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.
--- 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(-)
drivers/dsp/bridge/services/cfg.c +10 -52
@@ -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; }
drivers/dsp/bridge/services/clk.c +0 -10
@@ -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)
drivers/dsp/bridge/services/mem.c +2 -19
@@ -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 ;
drivers/dsp/bridge/services/sync.c +1 -19
@@ -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,
Signature · 1 line
1.6.2.4
PATCH 9/18 DSPBRIDGE: Remove excessive debug statements for rmgr
Removed debug statements that print redundant errors where returned statuses should be enough in case of failure.
--- 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(-)
drivers/dsp/bridge/rmgr/dbdcd.c +6 -58
@@ -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" ); }
drivers/dsp/bridge/rmgr/disp.c +13 -89
206 lines not on this page · raw message
drivers/dsp/bridge/rmgr/drv.c +0 -16
@@ -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);
drivers/dsp/bridge/rmgr/dspdrv.c +3 -8
@@ -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" );
drivers/dsp/bridge/rmgr/mgr.c +7 -33
@@ -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)
drivers/dsp/bridge/rmgr/nldr.c +3 -25
@@ -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) &&
drivers/dsp/bridge/rmgr/node.c +6 -86
236 lines not on this page · raw message
drivers/dsp/bridge/rmgr/proc.c +34 -234
559 lines not on this page · raw message
drivers/dsp/bridge/rmgr/rmm.c +2 -13
@@ -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);
drivers/dsp/bridge/rmgr/strm.c +9 -47
121 lines not on this page · raw message
Signature · 1 line
1.6.2.4
PATCH 10/18 DSPBRIDGE: Remove excessive debug statements for wmd
Removed debug statements that print redundant errors where returned statuses should be enough in case of failure.
--- 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(-)
drivers/dsp/bridge/wmd/chnl_sm.c +2 -21
@@ -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); }
drivers/dsp/bridge/wmd/io_sm.c +3 -42
106 lines not on this page · raw message
drivers/dsp/bridge/wmd/tiomap3430.c +13 -64
200 lines not on this page · raw message
drivers/dsp/bridge/wmd/tiomap3430_pwr.c +2 -30
@@ -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;
drivers/dsp/bridge/wmd/tiomap_io.c +6 -21
@@ -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)
drivers/dsp/bridge/wmd/ue_deh.c +0 -3
@@ -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 "
Signature · 1 line
1.6.2.4
PATCH 11/18 DSPBRIDGE: Remove excessive debug statements for pmgr
Removed debug statements that print redundant errors where returned statuses should be enough in case of failure.
--- 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(-)
drivers/dsp/bridge/pmgr/chnl.c +6 -14
@@ -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 ; }
drivers/dsp/bridge/pmgr/cmm.c +5 -53
151 lines not on this page · raw message
drivers/dsp/bridge/pmgr/cod.c +10 -47
123 lines not on this page · raw message
drivers/dsp/bridge/pmgr/dbll.c +3 -23
@@ -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 ; }
drivers/dsp/bridge/pmgr/dev.c +7 -81
246 lines not on this page · raw message
drivers/dsp/bridge/pmgr/dmm.c +1 -7
@@ -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 ;
drivers/dsp/bridge/pmgr/io.c +2 -8
@@ -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);
drivers/dsp/bridge/pmgr/wcd.c +3 -14
@@ -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;
Signature · 1 line
1.6.2.4
PATCH 12/18 DSPBRIDGE: Remove excessive debug statements for services
Removed debug statements that print redundant errors where returned statuses should be enough in case of failure.
--- 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(-)
drivers/dsp/bridge/services/cfg.c +2 -13
@@ -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
drivers/dsp/bridge/services/mem.c +0 -13
@@ -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 ; } }
drivers/dsp/bridge/services/sync.c +17 -77
208 lines not on this page · raw message
Signature · 1 line
1.6.2.4
PATCH 13/18 DSPBRIDGE: change init statements to pr_info in rmgr
Print to console if:
- Driver is succesfully installed.
- Baseimage is correctly loaded.
- Processor is started.
--- drivers/dsp/bridge/rmgr/drv_interface.c | 3 +-- drivers/dsp/bridge/rmgr/proc.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-)
drivers/dsp/bridge/rmgr/drv_interface.c +1 -2
@@ -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" ); } }
drivers/dsp/bridge/rmgr/proc.c +2 -4
@@ -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 ); } }
Signature · 1 line
1.6.2.4
PATCH 14/18 DSPBRIDGE: change critical error statements to pr_err in rmgr
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.
--- 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(-)
drivers/dsp/bridge/rmgr/drv.c +1 -2
@@ -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;
drivers/dsp/bridge/rmgr/drv_interface.c +12 -20
@@ -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) {
drivers/dsp/bridge/rmgr/node.c +36 -62
183 lines not on this page · raw message
drivers/dsp/bridge/rmgr/proc.c +9 -12
@@ -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:
Signature · 1 line
1.6.2.4
PATCH 15/18 DSPBRIDGE: change critical error statements to pr_err in wmd
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.
--- 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(-)
drivers/dsp/bridge/wmd/io_sm.c +9 -10
@@ -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 ;
drivers/dsp/bridge/wmd/tiomap3430.c +4 -4
@@ -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;
drivers/dsp/bridge/wmd/tiomap3430_pwr.c +3 -3
@@ -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 );
Signature · 1 line
1.6.2.4
PATCH 16/18 DSPBRIDGE: print dsp trace buffer by default
Print to console if the contents of the dsp trace buffer.
--- drivers/dsp/bridge/wmd/io_sm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/dsp/bridge/wmd/io_sm.c +1 -2
@@ -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);
Signature · 1 line
1.6.2.4
PATCH 17/18 DSPBRIDGE: change critical error statements to pr_err in pmgr
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.
--- 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(-)
drivers/dsp/bridge/pmgr/cod.c +6 -8
@@ -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; }
drivers/dsp/bridge/pmgr/dev.c +2 -3
@@ -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);
drivers/dsp/bridge/pmgr/dmm.c +4 -4
@@ -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; }
Signature · 1 line
1.6.2.4
PATCH 18/18 DSPBRIDGE: change critical error statements to pr_err in services
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.
--- 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(-)
drivers/dsp/bridge/services/cfg.c +8 -13
@@ -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; }
drivers/dsp/bridge/services/clk.c +9 -14
@@ -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;
drivers/dsp/bridge/services/mem.c +1 -3
@@ -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;
Signature · 1 line
1.6.2.4
Quoted 51 lines · Omar
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 topr_infoin rmgr
DSPBRIDGE: change critical error statements topr_errin rmgr
DSPBRIDGE: change critical error statements topr_errin wmd
DSPBRIDGE: print dsp trace buffer by default
DSPBRIDGE: change critical error statements topr_errin pmgr
DSPBRIDGE: change critical error statements topr_errin servicesdrivers/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 +---
Quoted 9 lines
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