Skip to contentSkip to conversation

Custom debug removal

PATCH In review Omar Ramirez Luna 1 participant 14 messages Feb 18, 2010 – Feb 23, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover Custom debug removal

Step 2 to remove custom debug tracing.

This set of patches gets rid of GT_* and DBG_* functionality, and replaces them to use dev_dbg instead.

This is meant to be a follow up of previous debug removal patches.

More info on dynamic_debug:
http://lwn.net/Articles/286191/

Omar Ramirez Luna (12):
DSPBRIDGE: global bridge device
DSPBRIDGE: Change custom GT_trace for dev_dbg
DSPBRIDGE: Change custom GT_trace for dev_dbg in wmd
DSPBRIDGE: Change custom GT_trace for dev_dbg in pmgr
DSPBRIDGE: Change custom GT_trace for dev_dbg in services
DSPBRIDGE: Remove GT_trace variables for rmgr
DSPBRIDGE: Remove GT_trace variables for wmd
DSPBRIDGE: Remove GT_trace variables for pmgr
DSPBRIDGE: Remove GT_trace variables for services
DSPBRIDGE: Remove custom debugging implementation
DSPBRIDGE: Remove debug header files
DSPBRIDGE: Remove unused instances of CONFIG_BRIDGE_DEBUG

 arch/arm/plat-omap/include/dspbridge/dbc.h     |    2 -
 arch/arm/plat-omap/include/dspbridge/dbg.h     |   89 -------
 arch/arm/plat-omap/include/dspbridge/gt.h      |  308 ----------------------
 arch/arm/plat-omap/include/dspbridge/host_os.h |    1 +
 drivers/dsp/bridge/Makefile                    |    4 +-
 drivers/dsp/bridge/gen/_gt_para.c              |   95 -------
 drivers/dsp/bridge/gen/gt.c                    |  336 ------------------------
 drivers/dsp/bridge/pmgr/chnl.c                 |   11 -
 drivers/dsp/bridge/pmgr/cmm.c                  |   19 +-
 drivers/dsp/bridge/pmgr/cod.c                  |   15 +-
 drivers/dsp/bridge/pmgr/dbll.c                 |   75 ++----
 drivers/dsp/bridge/pmgr/dev.c                  |    8 -
 drivers/dsp/bridge/pmgr/dmm.c                  |   58 ++---
 drivers/dsp/bridge/pmgr/io.c                   |   10 -
 drivers/dsp/bridge/pmgr/msg.c                  |   13 +-
 drivers/dsp/bridge/pmgr/wcd.c                  |    7 -
 drivers/dsp/bridge/rmgr/dbdcd.c                |   32 +--
 drivers/dsp/bridge/rmgr/disp.c                 |   69 ++----
 drivers/dsp/bridge/rmgr/drv.c                  |   96 +++----
 drivers/dsp/bridge/rmgr/drv_interface.c        |   55 ++---
 drivers/dsp/bridge/rmgr/dspdrv.c               |   14 +-
 drivers/dsp/bridge/rmgr/mgr.c                  |   31 +--
 drivers/dsp/bridge/rmgr/nldr.c                 |   43 +---
 drivers/dsp/bridge/rmgr/node.c                 |  118 +++------
 drivers/dsp/bridge/rmgr/proc.c                 |   94 ++-----
 drivers/dsp/bridge/rmgr/rmm.c                  |   11 -
 drivers/dsp/bridge/rmgr/strm.c                 |   45 ++--
 drivers/dsp/bridge/services/cfg.c              |   23 +--
 drivers/dsp/bridge/services/clk.c              |   12 +-
 drivers/dsp/bridge/services/dbg.c              |   88 ------
 drivers/dsp/bridge/services/mem.c              |    6 -
 drivers/dsp/bridge/services/ntfy.c             |    8 -
 drivers/dsp/bridge/services/reg.c              |    7 -
 drivers/dsp/bridge/services/regsup.c           |   26 +--
 drivers/dsp/bridge/services/services.c         |   21 +--
 drivers/dsp/bridge/services/sync.c             |    8 -
 drivers/dsp/bridge/wmd/chnl_sm.c               |    5 +-
 drivers/dsp/bridge/wmd/io_sm.c                 |  119 ++++-----
 drivers/dsp/bridge/wmd/mmu_fault.c             |   10 +-
 drivers/dsp/bridge/wmd/tiomap3430.c            |  134 +++++------
 drivers/dsp/bridge/wmd/tiomap3430_pwr.c        |   64 ++----
 drivers/dsp/bridge/wmd/tiomap_io.c             |    1 -
 drivers/dsp/bridge/wmd/tiomap_sm.c             |    6 +-
 drivers/dsp/bridge/wmd/ue_deh.c                |    6 +-
 44 files changed, 406 insertions(+), 1797 deletions(-)
 delete mode 100644 arch/arm/plat-omap/include/dspbridge/dbg.h
 delete mode 100644 arch/arm/plat-omap/include/dspbridge/gt.h
 delete mode 100644 drivers/dsp/bridge/gen/_gt_para.c
 delete mode 100644 drivers/dsp/bridge/gen/gt.c
 delete mode 100644 drivers/dsp/bridge/services/dbg.c
 create mode 100644 drivers/dsp/bridge/uTimeout
#1 lore raw

PATCH 1/12 DSPBRIDGE: global bridge device

This patch declares and externs a pointer to a bridge device to be used with dev_dbg.

---
 arch/arm/plat-omap/include/dspbridge/host_os.h |    1 +
 drivers/dsp/bridge/rmgr/drv_interface.c        |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)
arch/arm/plat-omap/include/dspbridge/host_os.h +1 -0
index 066c4d7..8cc1c6f 100644
@@ -68,6 +68,7 @@ struct dspbridge_platform_data {
 #define PRCM_VDD1 1
 
 extern struct platform_device *omap_dspbridge_dev;
+extern struct device *bridge;
 
 #if defined(CONFIG_MPU_BRIDGE) || defined(CONFIG_MPU_BRIDGE_MODULE)
 extern void dspbridge_reserve_sdram(void);
drivers/dsp/bridge/rmgr/drv_interface.c +4 -0
index cff2877..cadb670 100644
@@ -75,6 +75,7 @@
 s32 dsp_debug;
 
 struct platform_device *omap_dspbridge_dev;
+struct device *bridge;
 
 /* This is a test variable used by Bridge to test different sleep states */
 s32 dsp_test_sleepstate;
@@ -229,6 +230,9 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev)
 
 	omap_dspbridge_dev = pdev;
 
+	/* Global bridge device */
+	bridge = &omap_dspbridge_dev->dev;
+
 	/* use 2.6 device model */
 	result = alloc_chrdev_region(&dev, 0, 1, driver_name);
 	if (result < 0) {
Signature · 1 line
1.6.2.4
#2 lore raw

PATCH 2/12 DSPBRIDGE: Change custom GT_trace for dev_dbg

Remove GT_Trace custom debugging mechanism and use dev_dbg.

---
 drivers/dsp/bridge/rmgr/dbdcd.c         |   29 ++++-----
 drivers/dsp/bridge/rmgr/disp.c          |   58 ++++++------------
 drivers/dsp/bridge/rmgr/drv.c           |   91 ++++++++++++----------------
 drivers/dsp/bridge/rmgr/drv_interface.c |   27 ++++-----
 drivers/dsp/bridge/rmgr/dspdrv.c        |    8 +--
 drivers/dsp/bridge/rmgr/mgr.c           |   21 ++-----
 drivers/dsp/bridge/rmgr/nldr.c          |   26 +++-----
 drivers/dsp/bridge/rmgr/node.c          |   97 ++++++++++++------------------
 drivers/dsp/bridge/rmgr/proc.c          |   60 +++++++------------
 drivers/dsp/bridge/rmgr/strm.c          |   34 ++++++------
 10 files changed, 182 insertions(+), 269 deletions(-)
 create mode 100644 drivers/dsp/bridge/uTimeout
drivers/dsp/bridge/rmgr/dbdcd.c +13 -16
index 5e07abd..067f7a0 100644
@@ -473,8 +473,7 @@ DSP_STATUS DCD_GetObjectDef(IN struct DCD_MANAGER *hDcdMgr,
 		status = COD_ReadSection(lib, szSectName, pszCoffBuf, ulLen);
 	} else {
 		status = COD_ReadSection(lib, szSectName, pszCoffBuf, ulLen);
-		GT_0trace(curTrace, GT_4CLASS,
-			 "Skipped Byte swap for IVA !!\n");
+		dev_dbg(bridge, "%s: Skipped Byte swap for IVA!!\n", __func__);
 	}
 #else
 	status = COD_ReadSection(lib, szSectName, pszCoffBuf, ulLen);
@@ -485,8 +484,8 @@ DSP_STATUS DCD_GetObjectDef(IN struct DCD_MANAGER *hDcdMgr,
 			CompressBuf(pszCoffBuf, ulLen, DSPWORDSIZE);
 		} else {
 			CompressBuf(pszCoffBuf, ulLen, 1);
-			GT_0trace(curTrace, GT_4CLASS, "Compressing IVA "
-				 "COFF buffer by 1 for IVA !!\n");
+			dev_dbg(bridge, "%s: Compressing IVA COFF buffer by 1 "
+						"for IVA!!\n", __func__);
 		}
 
 		/* Parse the content of the COFF buffer. */
@@ -554,7 +553,7 @@ DSP_STATUS DCD_GetObjects(IN struct DCD_MANAGER *hDcdMgr, IN char *pszCoffPath,
 		status = COD_ReadSection(lib, DCD_REGISTER_SECTION,
 					pszCoffBuf, ulLen);
 	} else {
-		GT_0trace(curTrace, GT_4CLASS, "Skipped Byte swap for IVA!!\n");
+		dev_dbg(bridge, "%s: Skipped Byte swap for IVA!!\n", __func__);
 		status = COD_ReadSection(lib, DCD_REGISTER_SECTION,
 					pszCoffBuf, ulLen);
 	}
@@ -567,8 +566,8 @@ DSP_STATUS DCD_GetObjects(IN struct DCD_MANAGER *hDcdMgr, IN char *pszCoffPath,
 			CompressBuf(pszCoffBuf, ulLen, DSPWORDSIZE);
 		} else {
 			CompressBuf(pszCoffBuf, ulLen, 1);
-			GT_0trace(curTrace, GT_4CLASS, "Compress COFF buffer "
-				 "with 1 word for IVA !!\n");
+			dev_dbg(bridge, "%s: Compress COFF buffer with 1 word "
+						"for IVA!!\n", __func__);
 		}
 
 		/* Read from buffer and register object in buffer. */
@@ -633,10 +632,9 @@ DSP_STATUS DCD_GetLibraryName(IN struct DCD_MANAGER *hDcdMgr,
 	DBC_Require(pdwSize != NULL);
 	DBC_Require(IsValidHandle(hDcdMgr));
 
-	GT_4trace(curTrace, GT_ENTER,
-		 "DCD_GetLibraryName: hDcdMgr 0x%x, pUuid 0x%x, "
-		 " pstrLibName 0x%x, pdwSize 0x%x\n", hDcdMgr, pUuid,
-		 pstrLibName, pdwSize);
+	dev_dbg(bridge, "%s: hDcdMgr %p, pUuid %p, pstrLibName %p, pdwSize "
+					"%p\n", __func__, hDcdMgr, pUuid,
+					pstrLibName, pdwSize);
 
 	/*
 	 *  Pre-determine final key length. It's length of DCD_REGKEY +
@@ -783,8 +781,8 @@ DSP_STATUS DCD_RegisterObject(IN struct DSP_UUID *pUuid,
 			(objType == DSP_DCDEXECUTELIBTYPE) ||
 			(objType == DSP_DCDDELETELIBTYPE));
 
-	GT_3trace(curTrace, GT_ENTER, "DCD_RegisterObject: object UUID 0x%x, "
-		 "objType %d, szPathName %s\n", pUuid, objType, pszPathName);
+	dev_dbg(bridge, "%s: object UUID %p, objType %d, szPathName %s\n",
+					__func__, pUuid, objType, pszPathName);
 
 	/*
 	 * Pre-determine final key length. It's length of DCD_REGKEY +
@@ -832,9 +830,8 @@ DSP_STATUS DCD_RegisterObject(IN struct DSP_UUID *pUuid,
 		/* Add new reg value (UUID+objType) with COFF path info */
 		dwPathSize = strlen(pszPathName) + 1;
 		status = REG_SetValue(szRegKey, (u8 *)pszPathName, dwPathSize);
-		GT_2trace(curTrace, GT_6CLASS, "REG_SetValue  "
-			  "(u8 *)pszPathName=%s, dwPathSize=%d\n",
-			  pszPathName, dwPathSize);
+		dev_dbg(bridge, "%s: pszPathName=%s, dwPathSize=%d\n", __func__,
+						pszPathName, dwPathSize);
 	} else {
 		/* Deregister an existing object */
 		status = REG_DeleteValue(szRegKey);
drivers/dsp/bridge/rmgr/disp.c +20 -38

105 lines not on this page · raw message

drivers/dsp/bridge/rmgr/drv.c +39 -52

157 lines not on this page · raw message

drivers/dsp/bridge/rmgr/drv_interface.c +13 -14
index cadb670..4045784 100644
@@ -301,27 +301,26 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev)
 		status = -1;
 		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);
+	dev_dbg(bridge, "%s: requested shm_size = 0x%x\n", __func__, shm_size);
 
 	if (pdata->phys_mempool_base && pdata->phys_mempool_size) {
 		phys_mempool_base = pdata->phys_mempool_base;
 		phys_mempool_size = pdata->phys_mempool_size;
 	}
 
-	GT_1trace(driverTrace, GT_7CLASS, "phys_mempool_base = 0x%x \n",
-		 phys_mempool_base);
+	dev_dbg(bridge, "%s: phys_mempool_base = 0x%x \n", __func__,
+							phys_mempool_base);
 
-	GT_1trace(driverTrace, GT_7CLASS, "phys_mempool_size = 0x%x\n",
-		 phys_mempool_base);
+	dev_dbg(bridge, "%s: phys_mempool_size = 0x%x\n", __func__,
+							phys_mempool_base);
 	if ((phys_mempool_base > 0x0) && (phys_mempool_size > 0x0))
 		MEM_ExtPhysPoolInit(phys_mempool_base, phys_mempool_size);
 	if (tc_wordswapon) {
-		GT_0trace(driverTrace, GT_7CLASS, "TC Word Swap is enabled\n");
+		dev_dbg(bridge, "%s: TC Word Swap is enabled\n", __func__);
 		REG_SetValue(TCWORDSWAP, (u8 *)&tc_wordswapon,
 			    sizeof(tc_wordswapon));
 	} else {
-		GT_0trace(driverTrace, GT_7CLASS, "TC Word Swap is disabled\n");
+		dev_dbg(bridge, "%s: TC Word Swap is disabled\n", __func__);
 		REG_SetValue(TCWORDSWAP, (u8 *)&tc_wordswapon,
 			    sizeof(tc_wordswapon));
 	}
@@ -537,8 +536,8 @@ static long bridge_ioctl(struct file *filp, unsigned int code,
 		if (DSP_SUCCEEDED(status)) {
 			status = retval;
 		} else {
-			GT_1trace(driverTrace, GT_7CLASS,
-				 "IOCTL Failed, code : 0x%x\n", code);
+			dev_dbg(bridge, "%s: IOCTL Failed, code: 0x%x "
+				"status 0x%x\n", __func__, code, status);
 			status = -1;
 		}
 
@@ -561,10 +560,10 @@ static int bridge_mmap(struct file *filp, struct vm_area_struct *vma)
 	vma->vm_flags |= VM_RESERVED | VM_IO;
 	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
-	GT_6trace(driverTrace, GT_3CLASS,
-		 "vm filp %p offset %lx start %lx end %lx"
-		 " page_prot %lx flags %lx\n", filp, offset, vma->vm_start,
-		 vma->vm_end, vma->vm_page_prot, vma->vm_flags);
+	dev_dbg(bridge, "%s: vm filp %p offset %x start %lx end %lx page_prot "
+				"%lx flags %lx\n", __func__, filp, offset,
+				vma->vm_start, vma->vm_end, vma->vm_page_prot,
+				vma->vm_flags);
 
 	status = remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
 				vma->vm_end - vma->vm_start, vma->vm_page_prot);
drivers/dsp/bridge/rmgr/dspdrv.c +3 -5
index b6a9bc4..59c2ecb 100644
@@ -80,8 +80,7 @@ u32 DSP_Init(OUT u32 *initStatus)
 			(void)DRV_ReleaseResources
 				((u32) deviceNodeString, drvObject);
 	} else {
-		GT_0trace(curTrace, GT_7CLASS,
-			 "DSP_Init:DRV_RequestResources Failed \r\n");
+		dev_dbg(bridge, "%s: DRV_RequestResources Failed\n", __func__);
 		status = DSP_EFAIL;
 	}
 
@@ -102,8 +101,7 @@ u32 DSP_Init(OUT u32 *initStatus)
 		(void)DRV_Destroy(drvObject);
 		drvObject = NULL;
 		WCD_Exit();
-		GT_0trace(curTrace, GT_7CLASS,
-			 "DSP_Init:Logical device Failed to Load\n");
+		dev_dbg(bridge, "%s: Logical device failed init\n", __func__);
 	}	/* Unwinding the loaded drivers */
 func_cont:
 	/* Attempt to Start the Board */
@@ -113,7 +111,7 @@ func_cont:
 		 * into the device loader. */
 		(void)WCD_InitComplete2();
 	} else {
-		GT_0trace(curTrace, GT_7CLASS, "DSP_Init Failed\n");
+		dev_dbg(bridge, "%s: Failed\n", __func__);
 	}			/* End WCD_InitComplete2 */
 	DBC_Ensure((DSP_SUCCEEDED(status) && drvObject != NULL) ||
 		  (DSP_FAILED(status) && drvObject == NULL));
drivers/dsp/bridge/rmgr/mgr.c +7 -14
index b905906..73d7a66 100644
@@ -238,9 +238,7 @@ DSP_STATUS MGR_EnumProcessorInfo(u32 uProcessor,
 	/* Get The Manager Object from the Registry */
 	if (DSP_FAILED(CFG_GetObject((u32 *)&pMgrObject,
 	   REG_MGR_OBJECT))) {
-		GT_0trace(MGR_DebugMask, GT_7CLASS,
-			 "Manager_EnumProcessorInfo: "
-			 "Failed To Get MGR Object from Registry\r\n");
+		dev_dbg(bridge, "%s: Failed to get MGR Object\n", __func__);
 		goto func_end;
 	}
 	DBC_Assert(MEM_IsValidHandle(pMgrObject, SIGNATURE));
@@ -274,10 +272,8 @@ DSP_STATUS MGR_EnumProcessorInfo(u32 uProcessor,
 						pProcessorInfo;
 				*pExtInfo = GenObj.objData.extProcObj;
 			}
-			GT_1trace(MGR_DebugMask, GT_7CLASS,
-				 "Manager_EnumProcessorInfo: Got"
-				 " Proctype  from DCD %x \r\n",
-				 pProcessorInfo->uProcessorType);
+			dev_dbg(bridge, "%s: Got proctype  from DCD %x\n",
+				__func__, pProcessorInfo->uProcessorType);
 			/* See if we got the needed processor */
 			if (devType == DSP_UNIT) {
 				if (pProcessorInfo->uProcessorType ==
@@ -293,18 +289,15 @@ DSP_STATUS MGR_EnumProcessorInfo(u32 uProcessor,
 			pProcessorInfo->uProcessorType =
 					 chipResources.uChipType;
 		} else {
-			GT_1trace(MGR_DebugMask, GT_7CLASS,
-				 "Manager_EnumProcessorInfo: "
-				 "Failed to Get DCD Processor Info %x \r\n",
-				 status2);
+			dev_dbg(bridge, "%s: Failed to get DCD processor info "
+						"%x\n", __func__, status2);
 			status = DSP_EFAIL;
 		}
 	}
 	*puNumProcs = uProcIndex;
 	if (procDetect == false) {
-		GT_0trace(MGR_DebugMask, GT_7CLASS,
-			 "Manager_EnumProcessorInfo: Failed"
-			 " to get Proc info from DCD , so use CFG registry\n");
+		dev_dbg(bridge, "%s: Failed to get proc info from DCD, so use "
+						"CFG registry\n", __func__);
 		pProcessorInfo->uProcessorType = chipResources.uChipType;
 	}
 func_end:
drivers/dsp/bridge/rmgr/nldr.c +10 -16
index e964d4b..fb5a788 100644
@@ -509,10 +509,8 @@ DSP_STATUS NLDR_Create(OUT struct NLDR_OBJECT **phNldr,
 			/* Ok to not have dynamic loading memory */
 			status = DSP_SOK;
 			ulLen = 0;
-			GT_1trace(NLDR_debugMask, GT_6CLASS,
-				 "NLDR_Create: DBLL_getSect "
-				 "failed (no dynamic loading mem segments): "
-				 "0x%lx\n", status);
+			dev_dbg(bridge, "%s: failed - no dynamic loading mem "
+					"segments: 0x%x\n", __func__, status);
 		}
 	}
 	if (DSP_SUCCEEDED(status) && ulLen > 0) {
@@ -543,10 +541,9 @@ DSP_STATUS NLDR_Create(OUT struct NLDR_OBJECT **phNldr,
 				rmmSegs[i].space = 0;
 				pNldr->segTable[i] = (pMemInfo + i)->type;
 #ifdef CONFIG_BRIDGE_DEBUG
-				DBG_Trace(DBG_LEVEL7,
-				    "** (proc) DLL MEMSEGMENT: %d, Base: 0x%x, "
-				    "Length: 0x%x\n", i, rmmSegs[i].base,
-				    rmmSegs[i].length);
+				dev_dbg(bridge, "(proc) DLL MEMSEGMENT: %d, "
+					"Base: 0x%x, Length: 0x%x\n", i,
+					rmmSegs[i].base, rmmSegs[i].length);
 #endif
 			}
 		}
@@ -1596,8 +1593,7 @@ static DSP_STATUS RemoteAlloc(void **pRef, u16 space, u32 size,
 	nWords = (size + hNldr->usDSPWordSize - 1) / hNldr->usDSPWordSize;
 	/* Modify memory 'align' to account for DSP cache line size */
 	align = findLcm(GEM_CACHE_LINE_SIZE, align);
-	GT_1trace(NLDR_debugMask, GT_7CLASS,
-		 "RemoteAlloc: memory align to 0x%x \n", align);
+	dev_dbg(bridge, "%s: memory align to 0x%x\n", __func__, align);
 	if (segmentId != -1) {
 		pRmmAddr->segid = segmentId;
 		segid = segmentId;
@@ -1642,9 +1638,8 @@ static DSP_STATUS RemoteAlloc(void **pRef, u16 space, u32 size,
 		pRmmAddr->segid = segid;
 		status = RMM_alloc(rmm, segid, nWords, align, dspAddr, false);
 		if (DSP_FAILED(status)) {
-			GT_1trace(NLDR_debugMask, GT_6CLASS,
-				 "RemoteAlloc:Unable allocate "
-				 "from segment %d.\n", segid);
+			dev_dbg(bridge, "%s: Unable allocate from segment %d\n",
+							__func__, segid);
 		}
 	} else {
 		/* segid > MAXSEGID ==> Internal or external memory */
@@ -1669,9 +1664,8 @@ static DSP_STATUS RemoteAlloc(void **pRef, u16 space, u32 size,
 func_cont:
 	/* Haven't found memory yet, attempt to find any segment that works */
 	if (status == DSP_EMEMORY && !fReq) {
-		GT_0trace(NLDR_debugMask, GT_6CLASS,
-			 "RemoteAlloc: Preferred segment "
-			 "unavailable, trying another segment.\n");
+		dev_dbg(bridge, "%s: Preferred segment unavailable, trying "
+							"another\n", __func__);
 		for (i = 0; i < hNldr->nSegs; i++) {
 			/* All bits of memType must be set */
 			if ((hNldr->segTable[i] & memType) != memType)
drivers/dsp/bridge/rmgr/node.c +39 -58

260 lines not on this page · raw message

drivers/dsp/bridge/rmgr/proc.c +21 -39

146 lines not on this page · raw message

drivers/dsp/bridge/rmgr/strm.c +17 -17
index 52b796f..909a2b1 100644
@@ -171,8 +171,6 @@ DSP_STATUS STRM_Close(struct STRM_OBJECT *hStrm,
 
 	DBC_Require(cRefs > 0);
 
-	GT_1trace(STRM_debugMask, GT_ENTER, "STRM_Close: hStrm: 0x%x\n", hStrm);
-
 	if (!MEM_IsValidHandle(hStrm, STRM_SIGNATURE)) {
 		status = DSP_EHANDLE;
 	} else {
@@ -198,6 +196,8 @@ func_end:
 	DBC_Ensure(status == DSP_SOK || status == DSP_EHANDLE ||
 		  status == DSP_EPENDING || status == DSP_EFAIL);
 
+	dev_dbg(bridge, "%s: hStrm: %p, status 0x%x\n", __func__,
+							hStrm, status);
 	return status;
 }
 
@@ -387,9 +387,6 @@ DSP_STATUS STRM_Idle(struct STRM_OBJECT *hStrm, bool fFlush)
 
 	DBC_Require(cRefs > 0);
 
-	GT_2trace(STRM_debugMask, GT_ENTER, "STRM_Idle: hStrm: 0x%x\t"
-		 "fFlush: 0x%x\n", hStrm, fFlush);
-
 	if (!MEM_IsValidHandle(hStrm, STRM_SIGNATURE)) {
 		status = DSP_EHANDLE;
 	} else {
@@ -398,6 +395,9 @@ DSP_STATUS STRM_Idle(struct STRM_OBJECT *hStrm, bool fFlush)
 		status = (*pIntfFxns->pfnChnlIdle) (hStrm->hChnl,
 			 hStrm->uTimeout, fFlush);
 	}
+
+	dev_dbg(bridge, "%s: hStrm: %p fFlush: 0x%x status: 0x%x\n",
+					__func__, hStrm, fFlush, status);
 	return status;
 }
 
@@ -442,9 +442,6 @@ DSP_STATUS STRM_Issue(struct STRM_OBJECT *hStrm, IN u8 *pBuf, u32 ulBytes,
 	DBC_Require(cRefs > 0);
 	DBC_Require(pBuf != NULL);
 
-	GT_4trace(STRM_debugMask, GT_ENTER, "STRM_Issue: hStrm: 0x%x\tpBuf: "
-		 "0x%x\tulBytes: 0x%x\tdwArg: 0x%x\n", hStrm, pBuf, ulBytes,
-		 dwArg);
 	if (!MEM_IsValidHandle(hStrm, STRM_SIGNATURE)) {
 		status = DSP_EHANDLE;
 	} else {
@@ -465,6 +462,10 @@ DSP_STATUS STRM_Issue(struct STRM_OBJECT *hStrm, IN u8 *pBuf, u32 ulBytes,
 		if (status == CHNL_E_NOIORPS)
 			status = DSP_ESTREAMFULL;
 	}
+
+	dev_dbg(bridge, "%s: hStrm: %p pBuf: %p ulBytes: 0x%x dwArg: 0x%x "
+					"status: 0x%x\n", __func__, hStrm, pBuf,
+					ulBytes, dwArg, status);
 	return status;
 }
 
@@ -493,10 +494,6 @@ DSP_STATUS STRM_Open(struct NODE_OBJECT *hNode, u32 uDir, u32 uIndex,
 	DBC_Require(cRefs > 0);
 	DBC_Require(phStrm != NULL);
 	DBC_Require(pAttr != NULL);
-	GT_5trace(STRM_debugMask, GT_ENTER,
-		 "STRM_Open: hNode: 0x%x\tuDir: 0x%x\t"
-		 "uIndex: 0x%x\tpAttr: 0x%x\tphStrm: 0x%x\n",
-		 hNode, uDir, uIndex, pAttr, phStrm);
 	*phStrm = NULL;
 	if (uDir != DSP_TONODE && uDir != DSP_FROMNODE) {
 		status = DSP_EDIRECTION;
@@ -614,6 +611,10 @@ func_cont:
 		  (*phStrm == NULL && (status == DSP_EHANDLE ||
 		  status == DSP_EDIRECTION || status == DSP_EVALUE ||
 		  status == DSP_EFAIL)));
+
+	dev_dbg(bridge, "%s: hNode: %p uDir: 0x%x uIndex: 0x%x pAttr: %p "
+				"phStrm: %p status: 0x%x\n", __func__,
+				hNode, uDir, uIndex, pAttr, phStrm, status);
 	return status;
 }
 
@@ -635,11 +636,6 @@ DSP_STATUS STRM_Reclaim(struct STRM_OBJECT *hStrm, OUT u8 **pBufPtr,
 	DBC_Require(pulBytes != NULL);
 	DBC_Require(pdwArg != NULL);
 
-	GT_4trace(STRM_debugMask, GT_ENTER,
-		 "STRM_Reclaim: hStrm: 0x%x\tpBufPtr: 0x%x"
-		 "\tpulBytes: 0x%x\tpdwArg: 0x%x\n", hStrm, pBufPtr, pulBytes,
-		 pdwArg);
-
 	if (!MEM_IsValidHandle(hStrm, STRM_SIGNATURE)) {
 		status = DSP_EHANDLE;
 		goto func_end;
@@ -693,6 +689,10 @@ func_end:
 	DBC_Ensure(DSP_SUCCEEDED(status) || status == DSP_EHANDLE ||
 		  status == DSP_ETIMEOUT || status == DSP_ETRANSLATE ||
 		  status == DSP_EFAIL);
+
+	dev_dbg(bridge, "%s: hStrm: %p pBufPtr: %p pulBytes: %p pdwArg: %p "
+					"status 0x%x\n", __func__, hStrm,
+					pBufPtr, pulBytes, pdwArg, status);
 	return status;
 }
 
drivers/dsp/bridge/uTimeout new file +0 -0
new file mode 100644
index 0000000..e69de29
Signature · 1 line
1.6.2.4
#3 lore raw

PATCH 3/12 DSPBRIDGE: Change custom GT_trace for dev_dbg in wmd

Remove GT_Trace custom debugging mechanism and use dev_dbg.

---
 drivers/dsp/bridge/wmd/chnl_sm.c        |    4 +-
 drivers/dsp/bridge/wmd/io_sm.c          |  106 +++++++++++--------------
 drivers/dsp/bridge/wmd/mmu_fault.c      |    9 +-
 drivers/dsp/bridge/wmd/tiomap3430.c     |  133 ++++++++++++++-----------------
 drivers/dsp/bridge/wmd/tiomap3430_pwr.c |   47 +++++-------
 drivers/dsp/bridge/wmd/tiomap_sm.c      |    4 +-
 drivers/dsp/bridge/wmd/ue_deh.c         |    5 +-
 7 files changed, 136 insertions(+), 172 deletions(-)
drivers/dsp/bridge/wmd/chnl_sm.c +2 -2
index 5020e37..e681303 100644
@@ -446,8 +446,8 @@ DSP_STATUS WMD_CHNL_Destroy(struct CHNL_MGR *hChnlMgr)
 		for (iChnl = 0; iChnl < pChnlMgr->cChannels; iChnl++) {
 			status = WMD_CHNL_Close(pChnlMgr->apChannel[iChnl]);
 			if (DSP_FAILED(status))
-				DBG_Trace(DBG_LEVEL7, "Error in CHNL_Close "
-						"status 0x%x\n", status);
+				dev_dbg(bridge, "%s: Error status 0x%x\n",
+							__func__, status);
 		}
 		/* release critical section */
 		if (pChnlMgr->hCSObj)
drivers/dsp/bridge/wmd/io_sm.c +47 -59

217 lines not on this page · raw message

drivers/dsp/bridge/wmd/mmu_fault.c +4 -5
index 14cfd62..1a9137d 100644
@@ -83,9 +83,8 @@ irqreturn_t  MMU_FaultIsr(int irq, IN void *pRefData)
 			 (struct CFG_DEVNODE *)DRV_GetFirstDevExtension(),
 			 &resources);
 		if (DSP_FAILED(status))
-			DBG_Trace(DBG_LEVEL7,
-				 "**Failed to get Host Resources "
-				 "in MMU ISR **\n");
+			dev_dbg(bridge, "%s: Failed to get Host Resources\n",
+								__func__);
 		if (MMU_CheckIfFault(pDevContext)) {
 			printk(KERN_INFO "***** DSPMMU FAULT ***** IRQStatus "
 				"0x%x\n", dmmuEventMask);
@@ -132,8 +131,8 @@ static bool MMU_CheckIfFault(struct WMD_DEV_CONTEXT *pDevContext)
 	status = CFG_GetHostResources(
 		(struct CFG_DEVNODE *)DRV_GetFirstDevExtension(), &resources);
 	if (DSP_FAILED(status))
-		DBG_Trace(DBG_LEVEL7, "**Failed to get Host Resources in "
-			 "MMU_CheckIfFault **\n");
+		dev_dbg(bridge, "%s: Failed to get Host Resources in\n",
+								__func__);
 
 	hwStatus = HW_MMU_EventStatus(resources.dwDmmuBase, &dmmuEventMask);
 	if (dmmuEventMask  ==  HW_MMU_TRANSLATION_FAULT) {
drivers/dsp/bridge/wmd/tiomap3430.c +60 -73

282 lines not on this page · raw message

drivers/dsp/bridge/wmd/tiomap3430_pwr.c +19 -28

103 lines not on this page · raw message

drivers/dsp/bridge/wmd/tiomap_sm.c +2 -2
index 50f54c2..3fa24cd 100644
@@ -155,7 +155,7 @@ DSP_STATUS CHNLSM_InterruptDSP2(struct WMD_DEV_CONTEXT *pDevContext,
 		}
 	}
 
-	DBG_Trace(DBG_LEVEL3, "writing %x to Mailbox\n", wMbVal);
+	dev_dbg(bridge, "MBX: writing %x to Mailbox\n", wMbVal);
 	HW_MBOX_MsgWrite(resources.dwMboxBase, MBOX_ARM2DSP, wMbVal);
 	return DSP_SOK;
 }
@@ -177,7 +177,7 @@ bool CHNLSM_ISR(struct WMD_DEV_CONTEXT *pDevContext, bool *pfSchedDPC,
 		HW_MBOX_EventAck(resources.dwMboxBase, MBOX_DSP2ARM,
 				 HW_MBOX_U0_ARM, HW_MBOX_INT_NEW_MSG);
 
-		DBG_Trace(DBG_LEVEL3, "Read %x from Mailbox\n", mbxValue);
+		dev_dbg(bridge, "MBX: Read %x from Mailbox\n", mbxValue);
 		*pwIntrVal = (u16) mbxValue;
 	}
 	/* Set *pfSchedDPC to true; */
drivers/dsp/bridge/wmd/ue_deh.c +2 -3
index 031a1c8..618d6e2 100644
@@ -261,9 +261,8 @@ void WMD_DEH_Notify(struct DEH_MGR *hDehMgr, u32 ulEventMask,
 			break;
 #endif /* CONFIG_BRIDGE_NTFY_PWRERR */
 		default:
-			DBG_Trace(DBG_LEVEL6,
-				 "WMD_DEH_Notify: Unknown Error, errInfo = "
-				 "0x%x\n", dwErrInfo);
+			dev_dbg(bridge, "%s: Unknown Error, errInfo = 0x%x\n",
+							__func__, dwErrInfo);
 			break;
 		}
 
Signature · 1 line
1.6.2.4
#4 lore raw

PATCH 4/12 DSPBRIDGE: Change custom GT_trace for dev_dbg in pmgr

Remove GT_Trace custom debugging mechanism and use dev_dbg.

---
 drivers/dsp/bridge/pmgr/cmm.c  |    9 +++---
 drivers/dsp/bridge/pmgr/cod.c  |    5 +--
 drivers/dsp/bridge/pmgr/dbll.c |   59 +++++++++++++++++++---------------------
 drivers/dsp/bridge/pmgr/dmm.c  |   47 +++++++++++++-------------------
 drivers/dsp/bridge/pmgr/msg.c  |    4 +-
 5 files changed, 55 insertions(+), 69 deletions(-)
drivers/dsp/bridge/pmgr/cmm.c +4 -5
index 56f97a7..b30b724 100644
@@ -562,11 +562,10 @@ DSP_STATUS CMM_RegisterGPPSMSeg(struct CMM_OBJECT *hCmmMgr, u32 dwGPPBasePA,
 	DBC_Require(dwGPPBaseVA != 0);
 	DBC_Require((cFactor <= CMM_ADDTODSPPA) &&
 		   (cFactor >= CMM_SUBFROMDSPPA));
-	GT_6trace(CMM_debugMask, GT_ENTER,
-		  "CMM_RegisterGPPSMSeg dwGPPBasePA %x "
-		  "ulSize %x dwDSPAddrOffset %x dwDSPBase %x ulDSPSize %x "
-		  "dwGPPBaseVA %x\n", dwGPPBasePA, ulSize, dwDSPAddrOffset,
-		  dwDSPBase, ulDSPSize, dwGPPBaseVA);
+	dev_dbg(bridge, "%s: dwGPPBasePA %x ulSize %x dwDSPAddrOffset %x "
+			"dwDSPBase %x ulDSPSize %x dwGPPBaseVA %x\n", __func__,
+			dwGPPBasePA, ulSize, dwDSPAddrOffset, dwDSPBase,
+			ulDSPSize, dwGPPBaseVA);
 	if (!MEM_IsValidHandle(hCmmMgr, CMMSIGNATURE)) {
 		status = DSP_EHANDLE;
 		return status;
drivers/dsp/bridge/pmgr/cod.c +2 -3
index 541503c..62629e1 100644
@@ -449,9 +449,8 @@ DSP_STATUS COD_GetSymValue(struct COD_MANAGER *hMgr, char *pstrSym,
 	DBC_Require(pstrSym != NULL);
 	DBC_Require(pulValue != NULL);
 
-	GT_3trace(COD_debugMask, GT_ENTER, "Entered COD_GetSymValue Args \t\n"
-		  "hMgr: 0x%x\t\npstrSym: 0x%x\t\npulValue: 0x%x\n",
-		  hMgr, pstrSym, pulValue);
+	dev_dbg(bridge, "%s: hMgr: %p pstrSym: %s pulValue: %p\n",
+					__func__, hMgr, pstrSym, pulValue);
 	if (hMgr->baseLib) {
 		if (!hMgr->fxns.getAddrFxn(hMgr->baseLib, pstrSym, &pSym)) {
 			if (!hMgr->fxns.getCAddrFxn(hMgr->baseLib, pstrSym,
drivers/dsp/bridge/pmgr/dbll.c +28 -31

154 lines not on this page · raw message

drivers/dsp/bridge/pmgr/dmm.c +19 -28

101 lines not on this page · raw message

drivers/dsp/bridge/pmgr/msg.c +2 -2
index 69f39a8..34bac4e 100644
@@ -106,8 +106,8 @@ void MSG_Delete(struct MSG_MGR *hMsgMgr)
 	(*pIntfFxns->pfnMsgDelete)(hMsgMgr);
 
 	if (MEM_IsValidHandle(pMsgMgr, MSGMGR_SIGNATURE))
-		GT_1trace(MSG_debugMask, GT_7CLASS, "MSG_Delete: Error hMsgMgr "
-					"Valid Handle: 0x%x\n", hMsgMgr);
+		dev_dbg(bridge, "%s: Error hMsgMgr handle: %p\n",
+						__func__, hMsgMgr);
 }
 
 /*
Signature · 1 line
1.6.2.4
#5 lore raw

PATCH 5/12 DSPBRIDGE: Change custom GT_trace for dev_dbg in services

Remove GT_Trace custom debugging mechanism and use dev_dbg.

---
 drivers/dsp/bridge/services/cfg.c    |    3 +--
 drivers/dsp/bridge/services/clk.c    |    5 ++---
 drivers/dsp/bridge/services/regsup.c |   21 +++++++++------------
 3 files changed, 12 insertions(+), 17 deletions(-)
drivers/dsp/bridge/services/cfg.c +1 -2
index d26f8b9..295ff11 100644
@@ -205,8 +205,7 @@ DSP_STATUS CFG_GetHostResources(struct CFG_DEVNODE *hDevNode,
 	}
 #ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_FAILED(status))
-		GT_0trace(CFG_debugMask, GT_6CLASS,
-			  "CFG_GetHostResources Failed \n");
+		dev_dbg(bridge, "%s Failed, status 0x%x\n", __func__, status);
 #endif
 	return status;
 }
drivers/dsp/bridge/services/clk.c +2 -3
index f8c417a..04d49bd 100644
@@ -275,9 +275,8 @@ DSP_STATUS CLK_GetRate(IN enum SERVICES_ClkId clk_id, u32 *speedKhz)
 	if (pClk) {
 		clkSpeedHz = clk_get_rate(pClk);
 		*speedKhz = clkSpeedHz / 1000;
-		GT_2trace(CLK_debugMask, GT_6CLASS,
-			  "CLK_GetRate: clkSpeedHz = %d , "
-			 "speedinKhz=%d\n", clkSpeedHz, *speedKhz);
+		dev_dbg(bridge, "%s: clkSpeedHz = %d, speedinKhz = %d\n",
+					__func__, clkSpeedHz, *speedKhz);
 	} else {
 		pr_err("%s: failed to get %s, dev Id = %d\n", __func__,
 						SERVICES_Clks[clk_id].clk_name,
drivers/dsp/bridge/services/regsup.c +9 -12
index 0c77fb2..04f6b3a 100644
@@ -105,12 +105,7 @@ DSP_STATUS regsupGetValue(char *valName, void *pBuf, u32 *dataSize)
 						(struct list_head *) rv);
 	}
 
-	if (DSP_SUCCEEDED(retVal)) {
-		GT_2trace(REG_debugMask, GT_2CLASS, "G %s DATA %x ", valName,
-			  *(u32 *)pBuf);
-	} else {
-		GT_1trace(REG_debugMask, GT_3CLASS, "G %s FAILED\n", valName);
-	}
+	dev_dbg(bridge, "REG: get %s, status = 0x%x\n", valName, retVal);
 
 	return retVal;
 }
@@ -125,9 +120,6 @@ DSP_STATUS regsupSetValue(char *valName, void *pBuf, u32 dataSize)
 	DSP_STATUS retVal = DSP_EFAIL;
 	struct RegValue *rv = (struct RegValue *) LST_First(pRegKey);
 
-	GT_2trace(REG_debugMask, GT_2CLASS, "S %s DATA %x ", valName,
-		  *(u32 *)pBuf);
-
 	/*  Need to search through the entries looking for the right one.  */
 	while (rv) {
 		/*  See if the name matches.  */
@@ -171,6 +163,8 @@ DSP_STATUS regsupSetValue(char *valName, void *pBuf, u32 dataSize)
 		}
 	}
 
+	dev_dbg(bridge, "REG: set %s, status = 0x%x", valName, retVal);
+
 	return retVal;
 }
 
@@ -203,9 +197,6 @@ DSP_STATUS regsupEnumValue(IN u32 dwIndex, IN CONST char *pstrKey,
 			*pdwValueSize = strlen(&(rv->name[dwKeyLen]));
 			strncpy(pstrValue, &(rv->name[dwKeyLen]),
 				    *pdwValueSize + 1);
-			GT_3trace(REG_debugMask, GT_2CLASS,
-				  "E Key %s, Value %s, Data %x ",
-				  pstrKey, pstrValue, *(u32 *)pstrData);
 			/*  Set our status to good and exit.  */
 			retVal = DSP_SOK;
 			break;
@@ -217,6 +208,9 @@ DSP_STATUS regsupEnumValue(IN u32 dwIndex, IN CONST char *pstrKey,
 	if (count && DSP_FAILED(retVal))
 		retVal = REG_E_NOMOREITEMS;
 
+	dev_dbg(bridge, "REG: enum Key %s, Value %s, status = 0x%x",
+					pstrKey, pstrValue, retVal);
+
 	return retVal;
 }
 
@@ -248,6 +242,9 @@ DSP_STATUS regsupDeleteValue(IN CONST char *pstrValue)
 		rv = (struct RegValue *)LST_Next(pRegKey,
 				(struct list_head *)rv);
 	}
+
+	dev_dbg(bridge, "REG: del %s, status = 0x%x", pstrValue, retVal);
+
 	return retVal;
 
 }
Signature · 1 line
1.6.2.4
#6 lore raw

PATCH 6/12 DSPBRIDGE: Remove GT_trace variables for rmgr

This patch removes variables used to store masks and flags used for the previous debug implementation.

---
 drivers/dsp/bridge/rmgr/dbdcd.c         |    2 --
 drivers/dsp/bridge/rmgr/disp.c          |   10 ----------
 drivers/dsp/bridge/rmgr/drv.c           |    4 ----
 drivers/dsp/bridge/rmgr/drv_interface.c |    5 -----
 drivers/dsp/bridge/rmgr/dspdrv.c        |    5 -----
 drivers/dsp/bridge/rmgr/mgr.c           |    9 ---------
 drivers/dsp/bridge/rmgr/nldr.c          |   11 ++---------
 drivers/dsp/bridge/rmgr/node.c          |    9 ---------
 drivers/dsp/bridge/rmgr/proc.c          |   10 +---------
 drivers/dsp/bridge/rmgr/rmm.c           |   10 ----------
 drivers/dsp/bridge/rmgr/strm.c          |   10 ----------
 11 files changed, 3 insertions(+), 82 deletions(-)
drivers/dsp/bridge/rmgr/dbdcd.c +0 -2
index 067f7a0..9fd05a0 100644
@@ -67,8 +67,6 @@ struct DCD_MANAGER {
 static u32 cRefs;
 static u32 cEnumRefs;
 
-extern struct GT_Mask curTrace;
-
 /* Helper function prototypes. */
 static s32 Atoi(char *pszBuf);
 static DSP_STATUS GetAttrsFromBuf(char *pszBuf, u32 ulBufSize,
drivers/dsp/bridge/rmgr/disp.c +0 -10
index 8c05593..6ae3bcb 100644
@@ -81,11 +81,6 @@ struct DISP_OBJECT {
 
 static u32 cRefs;
 
-/* Debug msgs: */
-#if GT_TRACE
-static struct GT_Mask DISP_DebugMask = { NULL, NULL };
-#endif
-
 static void DeleteDisp(struct DISP_OBJECT *hDisp);
 static DSP_STATUS FillStreamDef(RMS_WORD *pdwBuf, u32 *ptotal, u32 offset,
 				struct NODE_STRMDEF strmDef, u32 max,
@@ -219,11 +214,6 @@ bool DISP_Init(void)
 
 	DBC_Require(cRefs >= 0);
 
-	if (cRefs == 0) {
-		DBC_Assert(!DISP_DebugMask.flags);
-		GT_create(&DISP_DebugMask, "DI");  /* "DI" for DIspatcher */
-	}
-
 	if (fRetVal)
 		cRefs++;
 
drivers/dsp/bridge/rmgr/drv.c +0 -4
index f3e2632..177d676 100644
@@ -66,10 +66,6 @@ struct DRV_EXT {
 /*  ----------------------------------- Globals */
 static s32 cRefs;
 
-#if GT_TRACE
-extern struct GT_Mask curTrace;
-#endif
-
 /*  ----------------------------------- Function Prototypes */
 static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 fRequest);
 static DSP_STATUS RequestBridgeResourcesDSP(u32 dwContext, s32 fRequest);
drivers/dsp/bridge/rmgr/drv_interface.c +0 -5
index 4045784..24246d5 100644
@@ -149,10 +149,6 @@ MODULE_VERSION(DSPBRIDGE_VERSION);
 
 static char *driver_name = DRIVER_NAME;
 
-#ifdef CONFIG_BRIDGE_DEBUG
-static struct GT_Mask driverTrace;
-#endif /* CONFIG_BRIDGE_DEBUG */
-
 static struct file_operations bridge_fops = {
 	.open		= bridge_open,
 	.release	= bridge_release,
@@ -261,7 +257,6 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev)
 			NULL, "DspBridge");
 
 	GT_init();
-	GT_create(&driverTrace, "LD");
 
 #ifdef CONFIG_BRIDGE_DEBUG
 	if (GT_str)
drivers/dsp/bridge/rmgr/dspdrv.c +0 -5
index 59c2ecb..0fdb150 100644
@@ -44,9 +44,6 @@
 /*  ----------------------------------- This */
 #include <dspbridge/dspdrv.h>
 
-/*  ----------------------------------- Globals */
-struct GT_Mask curTrace;
-
 /*
  *  ======== DSP_Init ========
  *  	Allocates bridge resources. Loads a base image onto DSP, if specified.
@@ -59,8 +56,6 @@ u32 DSP_Init(OUT u32 *initStatus)
 	u32 deviceNode;
 	u32 deviceNodeString;
 
-	GT_create(&curTrace, "DD");
-
 	if (!WCD_Init())
 		goto func_cont;
 
drivers/dsp/bridge/rmgr/mgr.c +0 -9
index 73d7a66..e63aaa1 100644
@@ -50,10 +50,6 @@ struct MGR_OBJECT {
 };
 
 /*  ----------------------------------- Globals */
-#if GT_TRACE
-static struct GT_Mask MGR_DebugMask = { NULL, NULL };
-#endif
-
 static u32 cRefs;
 
 /*
@@ -355,11 +351,6 @@ bool MGR_Init(void)
 	DBC_Require(cRefs >= 0);
 
 	if (cRefs == 0) {
-
-		/* Set the Trace mask */
-		DBC_Assert(!MGR_DebugMask.flags);
-
-		GT_create(&MGR_DebugMask, "MG");	/* "MG" for Manager */
 		fInitDCD = DCD_Init();	/*  DCD Module */
 
 		if (!fInitDCD)
drivers/dsp/bridge/rmgr/nldr.c +2 -9
index fb5a788..5c1266d 100644
@@ -292,7 +292,6 @@ static struct DBLL_Fxns dbllFxns = {
 	(DBLL_UnloadSectFxn) DBLL_unloadSect,
 };
 
-static struct GT_Mask NLDR_debugMask = { NULL, NULL };	/* GT trace variable */
 static u32 cRefs;		/* module reference count */
 
 static DSP_STATUS AddOvlyInfo(void *handle, struct DBLL_SectInfo *sectInfo,
@@ -679,10 +678,8 @@ void NLDR_Exit(void)
 
 	cRefs--;
 
-	if (cRefs == 0) {
+	if (cRefs == 0)
 		RMM_exit();
-		NLDR_debugMask.flags = NULL;
-	}
 
 	DBC_Ensure(cRefs >= 0);
 }
@@ -801,12 +798,8 @@ bool NLDR_Init(void)
 {
 	DBC_Require(cRefs >= 0);
 
-	if (cRefs == 0) {
-		DBC_Assert(!NLDR_debugMask.flags);
-		GT_create(&NLDR_debugMask, "NL");	/* "NL" for NLdr */
-
+	if (cRefs == 0)
 		RMM_init();
-	}
 
 	cRefs++;
 
drivers/dsp/bridge/rmgr/node.c +0 -9
index 48a7728..cb3d324 100644
@@ -266,10 +266,6 @@ static u32 Ovly(void *pPrivRef, u32 ulDspRunAddr, u32 ulDspLoadAddr,
 static u32 Write(void *pPrivRef, u32 ulDspAddr, void *pBuf,
 			u32 ulNumBytes, u32 nMemSpace);
 
-#if GT_TRACE
-static struct GT_Mask NODE_debugMask = { NULL, NULL };  /* GT trace variable */
-#endif
-
 #ifdef DSP_DMM_DEBUG
 extern u32 DMM_MemMapDump(struct DMM_OBJECT *hDmmMgr);
 #endif
@@ -1930,11 +1926,6 @@ bool NODE_Init(void)
 {
 	DBC_Require(cRefs >= 0);
 
-	if (cRefs == 0) {
-		DBC_Assert(!NODE_debugMask.flags);
-		GT_create(&NODE_debugMask, "NO");	/* "NO" for NOde */
-	}
-
 	cRefs++;
 
 	return true;
drivers/dsp/bridge/rmgr/proc.c +1 -9
index d8137c8..8489cd3 100644
@@ -72,9 +72,6 @@
 extern char *iva_img;
 
 /*  ----------------------------------- Globals */
-#if GT_TRACE
-static struct GT_Mask PROC_DebugMask = { NULL, NULL };	/* WCD MGR Mask */
-#endif
 
 /* The PROC_OBJECT structure.   */
 struct PROC_OBJECT {
@@ -785,13 +782,8 @@ bool PROC_Init(void)
 
 	DBC_Require(cRefs >= 0);
 
-	if (cRefs == 0) {
-		/* Set the Trace mask */
-		DBC_Assert(!PROC_DebugMask.flags);
-		GT_create(&PROC_DebugMask, "PR");  /* "PR" for Processor */
-
+	if (cRefs == 0)
 		(void)SYNC_InitializeCS(&hProcLock);
-	}
 
 	if (fRetval)
 		cRefs++;
drivers/dsp/bridge/rmgr/rmm.c +0 -10
index 8cf66ce..188faba 100644
@@ -87,10 +87,6 @@ struct RMM_TargetObj {
 	struct LST_LIST *ovlyList;	/* List of overlay memory in use */
 };
 
-#if GT_TRACE
-static struct GT_Mask RMM_debugMask = { NULL, NULL };	/* GT trace variable */
-#endif
-
 static u32 cRefs;		/* module reference count */
 
 static bool allocBlock(struct RMM_TargetObj *target, u32 segid, u32 size,
@@ -367,12 +363,6 @@ bool RMM_init(void)
 {
 	DBC_Require(cRefs >= 0);
 
-	if (cRefs == 0) {
-		DBC_Assert(!RMM_debugMask.flags);
-		GT_create(&RMM_debugMask, "RM");	/* "RM" for RMm */
-
-	}
-
 	cRefs++;
 
 	return true;
drivers/dsp/bridge/rmgr/strm.c +0 -10
index 909a2b1..6b62e41 100644
@@ -91,9 +91,6 @@ struct STRM_MGR {
 } ;
 
 /*  ----------------------------------- Globals */
-#if GT_TRACE
-static struct GT_Mask STRM_debugMask = { NULL, NULL };	/* GT trace variable */
-#endif
 static u32 cRefs;		/* module reference count */
 
 /*  ----------------------------------- Function Prototypes */
@@ -412,13 +409,6 @@ bool STRM_Init(void)
 
 	DBC_Require(cRefs >= 0);
 
-	if (cRefs == 0) {
-#if GT_TRACE
-		DBC_Assert(!STRM_debugMask.flags);
-		GT_create(&STRM_debugMask, "ST");	/* "ST" for STrm */
-#endif
-	}
-
 	if (fRetVal)
 		cRefs++;
 
Signature · 1 line
1.6.2.4
#7 lore raw

PATCH 7/12 DSPBRIDGE: Remove GT_trace variables for wmd

This patch removes variables used to store masks and flags used for the previous debug implementation.

---
 drivers/dsp/bridge/wmd/io_sm.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
drivers/dsp/bridge/wmd/io_sm.c +1 -5
index 00262db..967fb17 100644
@@ -166,10 +166,6 @@ extern s32 dsp_max_opps;
 extern u32 vdd1_dsp_freq[6][4] ;
 #endif
 
-#if GT_TRACE
-static struct GT_Mask dsp_trace_mask = { NULL, NULL }; /* GT trace variable */
-#endif
-
 /*
  *  ======== WMD_IO_Create ========
  *      Create an IO manager object.
@@ -2012,5 +2008,5 @@ DSP_STATUS PrintDspTraceBuffer(struct WMD_DEV_CONTEXT *hWmdContext)
 
 void IO_SM_init(void)
 {
-	GT_create(&dsp_trace_mask, "DT"); /* DSP Trace Mask */
+	/* Do nothing */
 }
Signature · 1 line
1.6.2.4
#8 lore raw

PATCH 8/12 DSPBRIDGE: Remove GT_trace variables for pmgr

This patch removes variables used to store masks and flags used for the previous debug implementation.

---
 drivers/dsp/bridge/pmgr/chnl.c |   10 ----------
 drivers/dsp/bridge/pmgr/cmm.c  |    9 ---------
 drivers/dsp/bridge/pmgr/cod.c  |    9 ---------
 drivers/dsp/bridge/pmgr/dbll.c |   15 ++-------------
 drivers/dsp/bridge/pmgr/dev.c  |    6 ------
 drivers/dsp/bridge/pmgr/dmm.c  |   10 ----------
 drivers/dsp/bridge/pmgr/io.c   |    9 ---------
 drivers/dsp/bridge/pmgr/msg.c  |    8 --------
 drivers/dsp/bridge/pmgr/wcd.c  |    6 ------
 9 files changed, 2 insertions(+), 80 deletions(-)
drivers/dsp/bridge/pmgr/chnl.c +0 -10
index 14a060c..cfece9c 100644
@@ -47,11 +47,6 @@
 
 /*  ----------------------------------- Globals */
 static u32 cRefs;
-#if GT_TRACE
-static struct GT_Mask CHNL_DebugMask = { NULL, NULL };	/* WCD CHNL Mask */
-#endif
-
-
 
 /*
  *  ======== CHNL_Create ========
@@ -165,11 +160,6 @@ bool CHNL_Init(void)
 
 	DBC_Require(cRefs >= 0);
 
-	if (cRefs == 0) {
-		DBC_Assert(!CHNL_DebugMask.flags);
-		GT_create(&CHNL_DebugMask, "CH");   /* "CH" for CHannel */
-	}
-
 	if (fRetval)
 		cRefs++;
 
drivers/dsp/bridge/pmgr/cmm.c +0 -9
index b30b724..e8fed86 100644
@@ -144,10 +144,6 @@ struct CMM_MNODE {
 
 
 /*  ----------------------------------- Globals */
-#if GT_TRACE
-static struct GT_Mask CMM_debugMask = { NULL, NULL };	/* GT trace variable */
-#endif
-
 static u32 cRefs;		/* module reference count */
 
 /*  ----------------------------------- Function Prototypes */
@@ -525,11 +521,6 @@ bool CMM_Init(void)
 	bool fRetval = true;
 
 	DBC_Require(cRefs >= 0);
-	if (cRefs == 0) {
-		/* Set the Trace mask */
-		/* "CM" for Comm Memory manager */
-		GT_create(&CMM_debugMask, "CM");
-	}
 	if (fRetval)
 		cRefs++;
 
drivers/dsp/bridge/pmgr/cod.c +0 -9
index 62629e1..9552618 100644
@@ -76,10 +76,6 @@ struct COD_LIBRARYOBJ {
 
 static u32 cRefs = 0L;
 
-#if GT_TRACE
-static struct GT_Mask COD_debugMask = { NULL, NULL };
-#endif
-
 static struct DBLL_Fxns dbllFxns = {
 	(DBLL_CloseFxn) DBLL_close,
 	(DBLL_CreateFxn) DBLL_create,
@@ -478,11 +474,6 @@ bool COD_Init(void)
 
 	DBC_Require(cRefs >= 0);
 
-	if (cRefs == 0) {
-		DBC_Assert(!COD_debugMask.flags);
-		GT_create(&COD_debugMask, "CO");
-	}
-
 	if (fRetVal)
 		cRefs++;
 
drivers/dsp/bridge/pmgr/dbll.c +2 -13
index 86832a3..0970974 100644
@@ -199,10 +199,6 @@ static u16 nameHash(void *name, u16 maxBucket);
 static bool nameMatch(void *name, void *sp);
 static void symDelete(void *sp);
 
-#if GT_TRACE
-static struct GT_Mask DBLL_debugMask = { NULL, NULL };  /* GT trace variable */
-#endif
-
 static u32 cRefs; 		/* module reference count */
 
 /* Symbol Redefinition */
@@ -302,12 +298,8 @@ void DBLL_exit(void)
 
 	cRefs--;
 
-	if (cRefs == 0) {
+	if (cRefs == 0)
 		GH_exit();
-#if GT_TRACE
-		DBLL_debugMask.flags = NULL;
-#endif
-	}
 
 	DBC_Ensure(cRefs >= 0);
 }
@@ -455,11 +447,8 @@ bool DBLL_init(void)
 {
 	DBC_Require(cRefs >= 0);
 
-	if (cRefs == 0) {
-		DBC_Assert(!DBLL_debugMask.flags);
-		GT_create(&DBLL_debugMask, "DL"); 	/* "DL" for dbDL */
+	if (cRefs == 0)
 		GH_init();
-	}
 
 	cRefs++;
 
drivers/dsp/bridge/pmgr/dev.c +0 -6
index e4450bc..20faf87 100644
@@ -89,9 +89,6 @@ struct DEV_OBJECT {
 
 /*  ----------------------------------- Globals */
 static u32 cRefs;		/* Module reference count */
-#if GT_TRACE
-static struct GT_Mask debugMask = { NULL, NULL };	/* For debugging */
-#endif
 
 /*  ----------------------------------- Function Prototypes */
 static DSP_STATUS FxnNotImplemented(int arg, ...);
@@ -775,9 +772,6 @@ bool DEV_Init(void)
 	DBC_Require(cRefs >= 0);
 
 	if (cRefs == 0) {
-		/* Set the Trace mask */
-		DBC_Assert(!debugMask.flags);
-		GT_create(&debugMask, "DV");	/* "DV" for DeVice */
 		fCmm = CMM_Init();
 		fDmm = DMM_Init();
 
drivers/dsp/bridge/pmgr/dmm.c +0 -10
index 098743f..9a1c6b0 100644
@@ -63,10 +63,6 @@ struct DMM_OBJECT {
 
 
 /*  ----------------------------------- Globals */
-#if GT_TRACE
-static struct GT_Mask DMM_debugMask = { NULL, NULL };	/* GT trace variable */
-#endif
-
 static u32 cRefs;		/* module reference count */
 struct MapPage {
 	u32   RegionSize:15;
@@ -258,12 +254,6 @@ bool DMM_Init(void)
 
 	DBC_Require(cRefs >= 0);
 
-	if (cRefs == 0) {
-		/* Set the Trace mask */
-		/*"DM" for Dymanic Memory Manager */
-		GT_create(&DMM_debugMask, "DM");
-	}
-
 	if (fRetval)
 		cRefs++;
 
drivers/dsp/bridge/pmgr/io.c +0 -9
index c6a4168..846562a 100644
@@ -43,10 +43,6 @@
 /*  ----------------------------------- Globals */
 static u32 cRefs;
 
-#if GT_TRACE
-static struct GT_Mask IO_DebugMask = { NULL, NULL };	/* WCD IO Mask */
-#endif
-
 /*
  *  ======== IO_Create ========
  *  Purpose:
@@ -140,11 +136,6 @@ bool IO_Init(void)
 
 	DBC_Require(cRefs >= 0);
 
-	if (cRefs == 0) {
-		DBC_Assert(!IO_DebugMask.flags);
-		GT_create(&IO_DebugMask, "IO");	/* "IO" for IO */
-	}
-
 	if (fRetval)
 		cRefs++;
 
drivers/dsp/bridge/pmgr/msg.c +0 -8
index 34bac4e..b7f3fc4 100644
@@ -42,9 +42,6 @@
 #include <dspbridge/msg.h>
 
 /*  ----------------------------------- Globals */
-#if GT_TRACE
-static struct GT_Mask MSG_debugMask = { NULL, NULL };	/* GT trace variable */
-#endif
 static u32 cRefs;		/* module reference count */
 
 /*
@@ -128,11 +125,6 @@ bool MSG_Init(void)
 {
 	DBC_Require(cRefs >= 0);
 
-	if (cRefs == 0) {
-		DBC_Assert(!MSG_debugMask.flags);
-		GT_create(&MSG_debugMask, "MS");	/* "MS" for MSg */
-	}
-
 	cRefs++;
 
 	DBC_Ensure(cRefs >= 0);
drivers/dsp/bridge/pmgr/wcd.c +0 -6
index 4b8ae3d..20a2b04 100644
@@ -78,9 +78,6 @@ struct WCD_Cmd {
 } ;
 
 /*  ----------------------------------- Globals */
-#if GT_TRACE
-static struct GT_Mask WCD_debugMask = { NULL, NULL };	/* Core VxD Mask */
-#endif
 static u32 WCD_cRefs;
 
 /*
@@ -304,9 +301,6 @@ bool WCD_Init(void)
 	bool fMGR, fPROC, fNODE, fDISP, fSTRM, fRMM;
 
 	if (WCD_cRefs == 0) {
-		/* initialize debugging module */
-		DBC_Assert(!WCD_debugMask.flags);
-		GT_create(&WCD_debugMask, "CD");    /* CD for class driver */
 		/* initialize class driver and other modules */
 		fDRV = DRV_Init();
 		fMGR = MGR_Init();
Signature · 1 line
1.6.2.4
#9 lore raw

PATCH 9/12 DSPBRIDGE: Remove GT_trace variables for services

This patch removes variables used to store masks and flags used for the previous debug implementation.

---
 drivers/dsp/bridge/services/cfg.c      |    6 ------
 drivers/dsp/bridge/services/clk.c      |    6 ------
 drivers/dsp/bridge/services/dbg.c      |    9 +--------
 drivers/dsp/bridge/services/mem.c      |    5 -----
 drivers/dsp/bridge/services/ntfy.c     |    7 -------
 drivers/dsp/bridge/services/reg.c      |    6 ------
 drivers/dsp/bridge/services/regsup.c   |    4 ----
 drivers/dsp/bridge/services/services.c |    6 ------
 drivers/dsp/bridge/services/sync.c     |    7 -------
 9 files changed, 1 insertions(+), 55 deletions(-)
drivers/dsp/bridge/services/cfg.c +0 -6
index 295ff11..19c296e 100644
@@ -36,11 +36,6 @@ struct DRV_EXT {
 	char szString[MAXREGPATHLENGTH];
 };
 
-/*  ----------------------------------- Globals */
-#if GT_TRACE
-static struct GT_Mask CFG_debugMask = { NULL, NULL };	/* CFG debug Mask */
-#endif
-
 /*
  *  ======== CFG_Exit ========
  *  Purpose:
@@ -253,7 +248,6 @@ DSP_STATUS CFG_GetObject(OUT u32 *pdwValue, u32 dwType)
 bool CFG_Init(void)
 {
 	struct CFG_DSPRES dspResources;
-	GT_create(&CFG_debugMask, "CF");	/* CF for ConFig */
 
 	dspResources.uChipType = DSPTYPE_64;
 	dspResources.cChips = 1;
drivers/dsp/bridge/services/clk.c +0 -6
index 04d49bd..d279036 100644
@@ -90,11 +90,6 @@ struct TIMER_OBJECT {
 	struct timer_list timer;
 };
 
-/*  ----------------------------------- Globals */
-#if GT_TRACE
-static struct GT_Mask CLK_debugMask = { NULL, NULL };	/* GT trace variable */
-#endif
-
 /*
  *  ======== CLK_Exit ========
  *  Purpose:
@@ -125,7 +120,6 @@ bool CLK_Init(void)
 	static struct platform_device dspbridge_device;
 	struct clk *clk_handle;
 	int i = 0;
-	GT_create(&CLK_debugMask, "CK");	/* CK for CLK */
 
 	dspbridge_device.dev.bus = &platform_bus_type;
 
drivers/dsp/bridge/services/dbg.c +1 -8
index a70297d..86c4628 100644
@@ -28,11 +28,6 @@
 /*  ----------------------------------- This */
 #include <dspbridge/dbg.h>
 
-/*  ----------------------------------- Globals */
-#if GT_TRACE
-static struct GT_Mask DBG_debugMask = { NULL, NULL };	/* GT trace var. */
-#endif
-
 #if (defined(CONFIG_BRIDGE_DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE
 
 /*
@@ -42,8 +37,6 @@ static struct GT_Mask DBG_debugMask = { NULL, NULL };	/* GT trace var. */
  */
 bool DBG_Init(void)
 {
-	GT_create(&DBG_debugMask, "WD");     /* for WmD (link driver) debug */
-
 	return true;
 }
 
@@ -69,7 +62,7 @@ DSP_STATUS DBG_Trace(u8 bLevel, char *pstrFormat, ...)
 
 	va_end(va);
 
-	if (bLevel & *(DBG_debugMask).flags)
+	if (bLevel)
 		printk(pstrFormat, arg1, arg2, arg3, arg4, arg5, arg6);
 
 	return DSP_SOK;
drivers/dsp/bridge/services/mem.c +0 -5
index 092b532..9eb50e5 100644
@@ -36,10 +36,6 @@
 #define MEM_512MB   0x1fffffff
 
 /*  ----------------------------------- Globals */
-#if GT_TRACE
-static struct GT_Mask MEM_debugMask = { NULL, NULL };	/* GT trace variable */
-#endif
-
 static bool extPhysMemPoolEnabled;
 
 struct extPhysMemPool {
@@ -271,6 +267,5 @@ void MEM_FreePhysMem(void *pVirtualAddress, u32 pPhysicalAddress,
  */
 bool MEM_Init(void)
 {
-	GT_create(&MEM_debugMask, "MM");	/* MM for MeM module */
 	return true;
 }
drivers/dsp/bridge/services/ntfy.c +0 -7
index a0abd56..4908be1 100644
@@ -66,11 +66,6 @@ struct NOTIFICATION {
 	struct SYNC_OBJECT *hSync;
 };
 
-/*  ----------------------------------- Globals */
-#if GT_TRACE
-static struct GT_Mask NTFY_debugMask = { NULL, NULL };  /* GT trace variable */
-#endif
-
 /*  ----------------------------------- Function Prototypes */
 static void DeleteNotify(struct NOTIFICATION *pNotify);
 
@@ -158,8 +153,6 @@ void NTFY_Exit(void)
  */
 bool NTFY_Init(void)
 {
-	GT_create(&NTFY_debugMask, "NY");	/* "NY" for NtfY */
-
 	return true;
 }
 
drivers/dsp/bridge/services/reg.c +0 -6
index 36c1519..2e87982 100644
@@ -35,10 +35,6 @@
 #include <dspbridge/reg.h>
 #include <regsup.h>
 
-#if GT_TRACE
-struct GT_Mask REG_debugMask = { NULL, NULL };	/* GT trace var. */
-#endif
-
 /*
  *  ======== REG_DeleteValue ========
  *  Deletes a registry entry value.  NOTE:  A registry entry value is not the
@@ -118,8 +114,6 @@ bool REG_Init(void)
 {
 	bool fInit;
 
-	GT_create(&REG_debugMask, "RG");	/* RG for ReG */
-
 	fInit = regsupInit();
 
 	return fInit;
drivers/dsp/bridge/services/regsup.c +0 -4
index 04f6b3a..fc625f4 100644
@@ -45,10 +45,6 @@ struct RegValue {
 /*  Pointer to the registry support key  */
 static struct LST_LIST regKey, *pRegKey = &regKey;
 
-#if GT_TRACE
-extern struct GT_Mask REG_debugMask;	/* GT trace var. */
-#endif
-
 /*
  *  ======== regsupInit ========
  *  Purpose:
drivers/dsp/bridge/services/services.c +0 -6
index 8a30ac6..87bb76b 100644
@@ -38,11 +38,6 @@
 /*  ----------------------------------- This */
 #include <dspbridge/services.h>
 
-/*  ----------------------------------- Globals */
-#if GT_TRACE
-static struct GT_Mask SERVICES_debugMask = { NULL, NULL };  /* GT trace var. */
-#endif
-
 /*
  *  ======== SERVICES_Exit ========
  *  Purpose:
@@ -75,7 +70,6 @@ bool SERVICES_Init(void)
 	bool fREG, fSYNC, fCLK, fNTFY;
 
 	GT_init();
-	GT_create(&SERVICES_debugMask, "OS");	/* OS for OSal */
 
 	/* Perform required initialization of SERVICES modules. */
 	fMEM = MEM_Init();
drivers/dsp/bridge/services/sync.c +0 -7
index f9cd360..f9cac58 100644
@@ -67,11 +67,6 @@ struct SYNC_DPCCSOBJECT {
 	s32 count;
 } ;
 
-/*  ----------------------------------- Globals */
-#if GT_TRACE
-static struct GT_Mask SYNC_debugMask = { NULL, NULL };  /* GT trace variable */
-#endif
-
 static int test_and_set(volatile void *ptr, int val)
 {
 	int ret = val;
@@ -123,8 +118,6 @@ void SYNC_Exit(void)
  */
 bool SYNC_Init(void)
 {
-	GT_create(&SYNC_debugMask, "SY");	/* SY for SYnc */
-
 	return true;
 }
 
Signature · 1 line
1.6.2.4
#10 lore raw

PATCH 10/12 DSPBRIDGE: Remove custom debugging implementation

Replace custom debug implementation with a friendly set of pr_err, pr_info and dev_dbg messages.

---
 arch/arm/plat-omap/include/dspbridge/dbg.h |   65 ------
 arch/arm/plat-omap/include/dspbridge/gt.h  |  271 ----------------------
 drivers/dsp/bridge/Makefile                |    4 +-
 drivers/dsp/bridge/gen/_gt_para.c          |   95 --------
 drivers/dsp/bridge/gen/gt.c                |  336 ----------------------------
 drivers/dsp/bridge/rmgr/drv_interface.c    |   16 --
 drivers/dsp/bridge/services/dbg.c          |   81 -------
 drivers/dsp/bridge/services/services.c     |   13 +-
 8 files changed, 4 insertions(+), 877 deletions(-)
 delete mode 100644 drivers/dsp/bridge/gen/_gt_para.c
 delete mode 100644 drivers/dsp/bridge/gen/gt.c
 delete mode 100644 drivers/dsp/bridge/services/dbg.c
arch/arm/plat-omap/include/dspbridge/dbg.h +0 -65
index 4d01eca..828fd71 100644
@@ -21,69 +21,4 @@
 #include <dspbridge/host_os.h>
 #include <linux/types.h>
 
-/* Levels of trace debug messages: */
-#define DBG_ENTER   (u8)(0x01)	/* Function entry point. */
-#define DBG_LEVEL1  (u8)(0x02)	/* Display debugging state/varibles */
-#define DBG_LEVEL2  (u8)(0x04)	/* Display debugging state/varibles */
-#define DBG_LEVEL3  (u8)(0x08)	/* Display debugging state/varibles */
-#define DBG_LEVEL4  (u8)(0x10)	/* Display debugging state/varibles */
-#define DBG_LEVEL5  (u8)(0x20)	/* Module Init, Exit */
-#define DBG_LEVEL6  (u8)(0x40)	/* Warn SERVICES Failures */
-#define DBG_LEVEL7  (u8)(0x80)	/* Warn Critical Errors */
-
-#if (defined(CONFIG_BRIDGE_DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE
-
-/*
- *  ======== DBG_Exit ========
- *  Purpose:
- *      Discontinue usage of module; free resources when reference count
- *      reaches 0.
- *  Parameters:
- *  Returns:
- *  Requires:
- *      DBG initialized.
- *  Ensures:
- *      Resources used by module are freed when cRef reaches zero.
- */
-	extern void DBG_Exit(void);
-
-/*
- *  ======== DBG_Init ========
- *  Purpose:
- *      Initializes private state of DBG module.
- *  Parameters:
- *  Returns:
- *      TRUE if initialized; FALSE if error occured.
- *  Requires:
- *  Ensures:
- */
-	extern bool DBG_Init(void);
-
-/*
- *  ======== DBG_Trace ========
- *  Purpose:
- *      Output a trace message to the debugger, if the given trace level
- *      is unmasked.
- *  Parameters:
- *      bLevel:         Trace level.
- *      pstrFormat:     sprintf-style format string.
- *      ...:            Arguments for format string.
- *  Returns:
- *      DSP_SOK:        Success, or trace level masked.
- *      DSP_EFAIL:      On Error.
- *  Requires:
- *      DBG initialized.
- *  Ensures:
- *      Debug message is printed to debugger output window, if trace level
- *      is unmasked.
- */
-	extern DSP_STATUS DBG_Trace(IN u8 bLevel, IN char *pstrFormat, ...);
-#else
-
-#define DBG_Exit(void) do {} while (0)
-#define DBG_Init(void) true
-#define DBG_Trace(bLevel, pstrFormat, args...) do {} while (0)
-
-#endif	/* (CONFIG_BRIDGE_DEBUG || DDSP_DEBUG_PRODUCT) && GT_TRACE */
-
 #endif				/* DBG_ */
arch/arm/plat-omap/include/dspbridge/gt.h +0 -271

275 lines not on this page · raw message

drivers/dsp/bridge/Makefile +2 -2
index 8aeb6a5..11d92cd 100644
@@ -1,10 +1,10 @@
 obj-$(CONFIG_MPU_BRIDGE)	+= bridgedriver.o
 
-libgen = gen/gb.o gen/gt.o gen/gs.o gen/gh.o gen/_gt_para.o gen/uuidutil.o
+libgen = gen/gb.o gen/gs.o gen/gh.o gen/uuidutil.o
 libservices = services/mem.o services/sync.o \
 		services/clk.o services/cfg.o services/reg.o \
                services/regsup.o services/ntfy.o \
-		services/dbg.o services/services.o
+		services/services.o
 libwmd = wmd/chnl_sm.o wmd/msg_sm.o wmd/io_sm.o wmd/tiomap3430.o \
 		wmd/tiomap3430_pwr.o wmd/tiomap_sm.o wmd/tiomap_io.o \
 		wmd/mmu_fault.o wmd/ue_deh.o
drivers/dsp/bridge/gen/_gt_para.c deleted +0 -95

95 lines not on this page · raw message

drivers/dsp/bridge/gen/gt.c deleted +0 -336

336 lines not on this page · raw message

drivers/dsp/bridge/rmgr/drv_interface.c +0 -16
index 24246d5..1d09bb5 100644
@@ -85,9 +85,6 @@ static struct cdev bridge_cdev;
 static struct class *bridge_class;
 
 static u32 driverContext;
-#ifdef CONFIG_BRIDGE_DEBUG
-static char *GT_str;
-#endif /* CONFIG_BRIDGE_DEBUG */
 static s32 driver_major;
 static char *base_img;
 char *iva_img;
@@ -117,9 +114,6 @@ static int omap34xxbridge_suspend_lockout(
 #endif
 
 #ifdef CONFIG_BRIDGE_DEBUG
-module_param(GT_str, charp, 0);
-MODULE_PARM_DESC(GT_str, "GT string, default = NULL");
-
 module_param(dsp_debug, int, 0);
 MODULE_PARM_DESC(dsp_debug, "Wait after loading DSP image. default = false");
 #endif
@@ -256,15 +250,6 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev)
 	device_create(bridge_class, NULL, MKDEV(driver_major, 0),
 			NULL, "DspBridge");
 
-	GT_init();
-
-#ifdef CONFIG_BRIDGE_DEBUG
-	if (GT_str)
-		GT_set(GT_str);
-#elif defined(DDSP_DEBUG_PRODUCT) && GT_TRACE
-	GT_set("**=67");
-#endif
-
 #ifdef CONFIG_PM
 	/* Initialize the wait queue */
 	if (!status) {
@@ -385,7 +370,6 @@ func_cont:
 	MEM_ExtPhysPoolRelease();
 
 	SERVICES_Exit();
-	GT_exit();
 
 	devno = MKDEV(driver_major, 0);
 	cdev_del(&bridge_cdev);
drivers/dsp/bridge/services/dbg.c deleted +0 -81

81 lines not on this page · raw message

drivers/dsp/bridge/services/services.c +2 -11
index 87bb76b..f1a8fa8 100644
@@ -51,11 +51,8 @@ void SERVICES_Exit(void)
 	SYNC_Exit();
 	CLK_Exit();
 	REG_Exit();
-	DBG_Exit();
 	CFG_Exit();
 	MEM_Exit();
-
-	GT_exit();
 }
 
 /*
@@ -66,21 +63,18 @@ void SERVICES_Exit(void)
 bool SERVICES_Init(void)
 {
 	bool fInit = true;
-	bool fCFG, fDBG, fMEM;
+	bool fCFG, fMEM;
 	bool fREG, fSYNC, fCLK, fNTFY;
 
-	GT_init();
-
 	/* Perform required initialization of SERVICES modules. */
 	fMEM = MEM_Init();
 	fREG = REG_Init();
 	fCFG = CFG_Init();
-	fDBG = DBG_Init();
 	fSYNC = SYNC_Init();
 	fCLK  = CLK_Init();
 	fNTFY = NTFY_Init();
 
-	fInit = fCFG && fDBG && fMEM && fREG && fSYNC && fCLK;
+	fInit = fCFG && fMEM && fREG && fSYNC && fCLK;
 
 	if (!fInit) {
 		if (fNTFY)
@@ -95,9 +89,6 @@ bool SERVICES_Init(void)
 		if (fREG)
 			REG_Exit();
 
-		if (fDBG)
-			DBG_Exit();
-
 		if (fCFG)
 			CFG_Exit();
 
Signature · 1 line
1.6.2.4
#11 lore raw

PATCH 11/12 DSPBRIDGE: Remove debug header files

This patch removes header files used in bridge debug implementation.

---
 arch/arm/plat-omap/include/dspbridge/dbc.h |    2 -
 arch/arm/plat-omap/include/dspbridge/dbg.h |   24 ------------------
 arch/arm/plat-omap/include/dspbridge/gt.h  |   37 ----------------------------
 drivers/dsp/bridge/pmgr/chnl.c             |    1 -
 drivers/dsp/bridge/pmgr/cmm.c              |    1 -
 drivers/dsp/bridge/pmgr/cod.c              |    1 -
 drivers/dsp/bridge/pmgr/dbll.c             |    1 -
 drivers/dsp/bridge/pmgr/dev.c              |    2 -
 drivers/dsp/bridge/pmgr/dmm.c              |    1 -
 drivers/dsp/bridge/pmgr/io.c               |    1 -
 drivers/dsp/bridge/pmgr/msg.c              |    1 -
 drivers/dsp/bridge/pmgr/wcd.c              |    1 -
 drivers/dsp/bridge/rmgr/dbdcd.c            |    1 -
 drivers/dsp/bridge/rmgr/disp.c             |    1 -
 drivers/dsp/bridge/rmgr/drv.c              |    1 -
 drivers/dsp/bridge/rmgr/drv_interface.c    |    1 -
 drivers/dsp/bridge/rmgr/dspdrv.c           |    1 -
 drivers/dsp/bridge/rmgr/mgr.c              |    1 -
 drivers/dsp/bridge/rmgr/nldr.c             |    4 ---
 drivers/dsp/bridge/rmgr/node.c             |    2 -
 drivers/dsp/bridge/rmgr/proc.c             |    1 -
 drivers/dsp/bridge/rmgr/rmm.c              |    1 -
 drivers/dsp/bridge/rmgr/strm.c             |    1 -
 drivers/dsp/bridge/services/cfg.c          |    1 -
 drivers/dsp/bridge/services/clk.c          |    1 -
 drivers/dsp/bridge/services/mem.c          |    1 -
 drivers/dsp/bridge/services/ntfy.c         |    1 -
 drivers/dsp/bridge/services/reg.c          |    1 -
 drivers/dsp/bridge/services/regsup.c       |    1 -
 drivers/dsp/bridge/services/services.c     |    2 -
 drivers/dsp/bridge/services/sync.c         |    1 -
 drivers/dsp/bridge/wmd/chnl_sm.c           |    1 -
 drivers/dsp/bridge/wmd/io_sm.c             |    2 -
 drivers/dsp/bridge/wmd/mmu_fault.c         |    1 -
 drivers/dsp/bridge/wmd/tiomap3430.c        |    1 -
 drivers/dsp/bridge/wmd/tiomap3430_pwr.c    |    3 --
 drivers/dsp/bridge/wmd/tiomap_io.c         |    1 -
 drivers/dsp/bridge/wmd/tiomap_sm.c         |    2 -
 drivers/dsp/bridge/wmd/ue_deh.c            |    1 -
 39 files changed, 0 insertions(+), 109 deletions(-)
 delete mode 100644 arch/arm/plat-omap/include/dspbridge/dbg.h
 delete mode 100644 arch/arm/plat-omap/include/dspbridge/gt.h
arch/arm/plat-omap/include/dspbridge/dbc.h +0 -2
index 1b3ac44..c4bf803 100644
@@ -32,8 +32,6 @@
 /* Assertion Macros: */
 #if GT_TRACE
 
-#include <dspbridge/gt.h>
-
 #define DBC_Assert(exp) \
     if (!(exp)) \
 	pr_err("%s, line %d: Assertion (" #exp ") failed.\n", \
arch/arm/plat-omap/include/dspbridge/dbg.h deleted +0 -24
deleted file mode 100644
index 828fd71..0000000
@@ -1,24 +0,0 @@
-/*
- * dbg.h
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * Provide debugging services for Bridge Mini Drivers.
- *
- * Copyright (C) 2008 Texas Instruments, Inc.
- *
- * This package is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef DBG_
-#define DBG_
-#include <dspbridge/host_os.h>
-#include <linux/types.h>
-
-#endif				/* DBG_ */
arch/arm/plat-omap/include/dspbridge/gt.h deleted +0 -37
deleted file mode 100644
index 116bb6f..0000000
@@ -1,37 +0,0 @@
-/*
- * gt.h
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * Copyright (C) 2008 Texas Instruments, Inc.
- *
- * This package is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
- * There are two definitions that affect which portions of trace
- * are acutally compiled into the client: GT_TRACE and GT_ASSERT. If
- * GT_TRACE is set to 0 then all trace statements (except for assertions)
- * will be compiled out of the client. If GT_ASSERT is set to 0 then
- * assertions will be compiled out of the client. GT_ASSERT can not be
- * set to 0 unless GT_TRACE is also set to 0 (i.e. GT_TRACE == 1 implies
- * GT_ASSERT == 1).
- */
-
-#include <linux/types.h>
-#ifndef GT_
-#define GT_
-
-#ifndef GT_TRACE
-#define GT_TRACE 0	    /* 0 = "trace compiled out"; 1 = "trace active" */
-#endif
-
-#include <dspbridge/host_os.h>
-
-#endif				/* GTCE_ */
drivers/dsp/bridge/pmgr/chnl.c +0 -1
index cfece9c..6331b97 100644
@@ -27,7 +27,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/cfg.h>
drivers/dsp/bridge/pmgr/cmm.c +0 -1
index e8fed86..0cd50b1 100644
@@ -37,7 +37,6 @@
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
 #include <dspbridge/errbase.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/cfg.h>
drivers/dsp/bridge/pmgr/cod.c +0 -1
index 9552618..1b535fd 100644
@@ -32,7 +32,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/ldr.h>
drivers/dsp/bridge/pmgr/dbll.c +0 -1
index 0970974..904e03d 100644
@@ -23,7 +23,6 @@
 #include <dspbridge/errbase.h>
 
 /*  ----------------------------------- Trace & Debug */
-#include <dspbridge/gt.h>
 #include <dspbridge/dbc.h>
 #include <dspbridge/gh.h>
 
drivers/dsp/bridge/pmgr/dev.c +0 -2
index 20faf87..42c5c6a 100644
@@ -26,8 +26,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/dbg.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/cfg.h>
drivers/dsp/bridge/pmgr/dmm.c +0 -1
index 9a1c6b0..b0d5d5c 100644
@@ -31,7 +31,6 @@
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
 #include <dspbridge/errbase.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/mem.h>
drivers/dsp/bridge/pmgr/io.c +0 -1
index 846562a..701d047 100644
@@ -26,7 +26,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/cfg.h>
drivers/dsp/bridge/pmgr/msg.c +0 -1
index b7f3fc4..0f40051 100644
@@ -26,7 +26,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/mem.h>
drivers/dsp/bridge/pmgr/wcd.c +0 -1
index 20a2b04..08728d1 100644
@@ -27,7 +27,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/cfg.h>
drivers/dsp/bridge/rmgr/dbdcd.c +0 -1
index 9fd05a0..0fcf9cc 100644
@@ -32,7 +32,6 @@
 #include <dspbridge/errbase.h>
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/mem.h>
drivers/dsp/bridge/rmgr/disp.c +0 -1
index 6ae3bcb..645f233 100644
@@ -26,7 +26,6 @@
 #include <dspbridge/errbase.h>
 
 /*  ----------------------------------- Trace & Debug */
-#include <dspbridge/gt.h>
 #include <dspbridge/dbc.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
drivers/dsp/bridge/rmgr/drv.c +0 -1
index 177d676..f323c8f 100644
@@ -26,7 +26,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/cfg.h>
drivers/dsp/bridge/rmgr/drv_interface.c +0 -1
index 1d09bb5..74478dd 100644
@@ -37,7 +37,6 @@
 #include <dspbridge/errbase.h>
 
 /*  ----------------------------------- Trace & Debug */
-#include <dspbridge/gt.h>
 #include <dspbridge/dbc.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
drivers/dsp/bridge/rmgr/dspdrv.c +0 -1
index 0fdb150..cc965c4 100644
@@ -26,7 +26,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/cfg.h>
drivers/dsp/bridge/rmgr/mgr.c +0 -1
index e63aaa1..cf015a4 100644
@@ -25,7 +25,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/cfg.h>
drivers/dsp/bridge/rmgr/nldr.c +0 -4
index 5c1266d..9e9dfc8 100644
@@ -23,10 +23,6 @@
 #include <dspbridge/errbase.h>
 
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
-#ifdef CONFIG_BRIDGE_DEBUG
-#include <dspbridge/dbg.h>
-#endif
 
 /* OS adaptation layer */
 #include <dspbridge/mem.h>
drivers/dsp/bridge/rmgr/node.c +0 -2
index cb3d324..4eb6582 100644
@@ -26,7 +26,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/cfg.h>
@@ -56,7 +55,6 @@
 #include <dspbridge/gb.h>
 #ifdef CONFIG_BRIDGE_DEBUG
 #include <dspbridge/uuidutil.h>
-#include <dspbridge/dbg.h>
 #endif
 
 /*  ----------------------------------- This */
drivers/dsp/bridge/rmgr/proc.c +0 -1
index 8489cd3..c5f4577 100644
@@ -26,7 +26,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/cfg.h>
drivers/dsp/bridge/rmgr/rmm.c +0 -1
index 188faba..506bc57 100644
@@ -44,7 +44,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/list.h>
drivers/dsp/bridge/rmgr/strm.c +0 -1
index 6b62e41..63319ee 100644
@@ -26,7 +26,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/mem.h>
drivers/dsp/bridge/services/cfg.c +0 -1
index 19c296e..1b7e0ea 100644
@@ -23,7 +23,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/reg.h>
drivers/dsp/bridge/services/clk.c +0 -1
index d279036..4ef4290 100644
@@ -26,7 +26,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/mem.h>
drivers/dsp/bridge/services/mem.c +0 -1
index 9eb50e5..740377f 100644
@@ -26,7 +26,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- This */
 #include <dspbridge/mem.h>
drivers/dsp/bridge/services/ntfy.c +0 -1
index 4908be1..4e73c5f 100644
@@ -26,7 +26,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/list.h>
drivers/dsp/bridge/services/reg.c +0 -1
index 2e87982..2187aed 100644
@@ -26,7 +26,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/mem.h>
drivers/dsp/bridge/services/regsup.c +0 -1
index fc625f4..8df6fec 100644
@@ -26,7 +26,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/mem.h>
drivers/dsp/bridge/services/services.c +0 -2
index f1a8fa8..dac0b39 100644
@@ -24,11 +24,9 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/cfg.h>
-#include <dspbridge/dbg.h>
 #include <dspbridge/mem.h>
 #include <dspbridge/ntfy.h>
 #include <dspbridge/reg.h>
drivers/dsp/bridge/services/sync.c +0 -1
index f9cac58..bd07938 100644
@@ -26,7 +26,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/mem.h>
drivers/dsp/bridge/wmd/chnl_sm.c +0 -1
index e681303..3696fad 100644
@@ -52,7 +52,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/dbg.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/mem.h>
drivers/dsp/bridge/wmd/io_sm.c +0 -2
index 967fb17..e863478 100644
@@ -35,7 +35,6 @@
 
 /* Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/dbg.h>
 
 /* Services Layer */
 #include <dspbridge/cfg.h>
@@ -70,7 +69,6 @@
 /* This */
 #include <dspbridge/io_sm.h>
 #include "_msg_sm.h"
-#include <dspbridge/gt.h>
 
 /* Defines, Data Structures, Typedefs */
 #define OUTPUTNOTREADY  0xffff
drivers/dsp/bridge/wmd/mmu_fault.c +0 -1
index 1a9137d..8cac1ef 100644
@@ -24,7 +24,6 @@
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/host_os.h>
 #include <dspbridge/dbc.h>
-#include <dspbridge/dbg.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/mem.h>
drivers/dsp/bridge/wmd/tiomap3430.c +0 -1
index c91f919..b19d479 100644
@@ -33,7 +33,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/dbg.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/mem.h>
drivers/dsp/bridge/wmd/tiomap3430_pwr.c +0 -3
index bdff0a7..16e786a 100644
@@ -24,9 +24,6 @@
 #include <dspbridge/io_sm.h>
 #include <dspbridge/chnl_sm.h>
 
-/*  ----------------------------------- Trace & Debug */
-#include <dspbridge/dbg.h>
-
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/mem.h>
 
drivers/dsp/bridge/wmd/tiomap_io.c +0 -1
index d11d605..d107a3c 100644
@@ -22,7 +22,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/dbg.h>
 
 /*  ----------------------------------- Platform Manager */
 #include <dspbridge/dev.h>
drivers/dsp/bridge/wmd/tiomap_sm.c +0 -2
index 3fa24cd..ed18fdd 100644
@@ -21,8 +21,6 @@
 #include <dspbridge/drv.h>
 #include <dspbridge/dev.h>
 
-#include <dspbridge/dbg.h>
-
 #include "_tiomap.h"
 #include "_tiomap_pwr.h"
 
drivers/dsp/bridge/wmd/ue_deh.c +0 -1
index 618d6e2..5c69f7e 100644
@@ -26,7 +26,6 @@
 
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
-#include <dspbridge/dbg.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/cfg.h>
Signature · 1 line
1.6.2.4
#12 lore raw

PATCH 12/12 DSPBRIDGE: Remove unused instances of CONFIG_BRIDGE_DEBUG

Remove unused instances of CONFIG_BRIDGE_DEBUG.

---
 drivers/dsp/bridge/rmgr/drv_interface.c |    2 --
 drivers/dsp/bridge/rmgr/nldr.c          |    2 --
 drivers/dsp/bridge/rmgr/node.c          |   10 ----------
 drivers/dsp/bridge/rmgr/proc.c          |   23 +++++------------------
 drivers/dsp/bridge/services/cfg.c       |   13 +------------
 drivers/dsp/bridge/wmd/io_sm.c          |    5 -----
 drivers/dsp/bridge/wmd/tiomap3430_pwr.c |   14 --------------
 7 files changed, 6 insertions(+), 63 deletions(-)
drivers/dsp/bridge/rmgr/drv_interface.c +0 -2
index 74478dd..373a33c 100644
@@ -112,10 +112,8 @@ static int omap34xxbridge_suspend_lockout(
 }
 #endif
 
-#ifdef CONFIG_BRIDGE_DEBUG
 module_param(dsp_debug, int, 0);
 MODULE_PARM_DESC(dsp_debug, "Wait after loading DSP image. default = false");
-#endif
 
 module_param(dsp_test_sleepstate, int, 0);
 MODULE_PARM_DESC(dsp_test_sleepstate, "DSP Sleep state = 0");
drivers/dsp/bridge/rmgr/nldr.c +0 -2
index 9e9dfc8..481a1bc 100644
@@ -535,11 +535,9 @@ DSP_STATUS NLDR_Create(OUT struct NLDR_OBJECT **phNldr,
 				rmmSegs[i].length = (pMemInfo + i)->len;
 				rmmSegs[i].space = 0;
 				pNldr->segTable[i] = (pMemInfo + i)->type;
-#ifdef CONFIG_BRIDGE_DEBUG
 				dev_dbg(bridge, "(proc) DLL MEMSEGMENT: %d, "
 					"Base: 0x%x, Length: 0x%x\n", i,
 					rmmSegs[i].base, rmmSegs[i].length);
-#endif
 			}
 		}
 	}
drivers/dsp/bridge/rmgr/node.c +0 -10
index 4eb6582..f4bb675 100644
@@ -53,9 +53,7 @@
 
 /*  ----------------------------------- Others */
 #include <dspbridge/gb.h>
-#ifdef CONFIG_BRIDGE_DEBUG
 #include <dspbridge/uuidutil.h>
-#endif
 
 /*  ----------------------------------- This */
 #include <dspbridge/nodepriv.h>
@@ -2853,9 +2851,7 @@ static DSP_STATUS GetNodeProps(struct DCD_MANAGER *hDcdMgr,
 	enum NODE_TYPE nodeType = NODE_TASK;
 	struct DSP_NDBPROPS *pndbProps = &(pdcdProps->objData.nodeObj.ndbProps);
 	DSP_STATUS status = DSP_SOK;
-#ifdef CONFIG_BRIDGE_DEBUG
 	char szUuid[MAXUUIDLEN];
-#endif
 
 	status = DCD_GetObjectDef(hDcdMgr, (struct DSP_UUID *)pNodeId,
 				 DSP_DCDNODETYPE, pdcdProps);
@@ -2863,12 +2859,10 @@ static DSP_STATUS GetNodeProps(struct DCD_MANAGER *hDcdMgr,
 	if (DSP_SUCCEEDED(status)) {
 		hNode->nType = nodeType = pndbProps->uNodeType;
 
-#ifdef CONFIG_BRIDGE_DEBUG
 		/* Create UUID value to set in registry. */
 		UUID_UuidToString((struct DSP_UUID *)pNodeId, szUuid,
 				 MAXUUIDLEN);
 		dev_dbg(bridge, "(node) UUID: %s\n", szUuid);
-#endif
 
 		/* Fill in message args that come from NDB */
 		if (nodeType != NODE_DEVICE) {
@@ -2877,10 +2871,8 @@ static DSP_STATUS GetNodeProps(struct DCD_MANAGER *hDcdMgr,
 			pMsgArgs->uNotifyType = pdcdProps->objData.nodeObj.
 						uMsgNotifyType;
 			pMsgArgs->uMaxMessages = pndbProps->uMessageDepth;
-#ifdef CONFIG_BRIDGE_DEBUG
 			dev_dbg(bridge, "(node) Max Number of Messages: 0x%x\n",
 				 pMsgArgs->uMaxMessages);
-#endif
 		} else {
 			/* Copy device name */
 			DBC_Require(pndbProps->acName);
@@ -2903,7 +2895,6 @@ static DSP_STATUS GetNodeProps(struct DCD_MANAGER *hDcdMgr,
 			pTaskArgs->uStackSize = pndbProps->uStackSize;
 			pTaskArgs->uSysStackSize = pndbProps->uSysStackSize;
 			pTaskArgs->uStackSeg = pndbProps->uStackSeg;
-#ifdef CONFIG_BRIDGE_DEBUG
 			dev_dbg(bridge, "(node) Priority: 0x%x Stack Size: "
 				"0x%x words System Stack Size: 0x%x words "
 				"Stack Segment: 0x%x profile count : 0x%x\n",
@@ -2911,7 +2902,6 @@ static DSP_STATUS GetNodeProps(struct DCD_MANAGER *hDcdMgr,
 				pTaskArgs->uSysStackSize,
 				pTaskArgs->uStackSeg,
 				pndbProps->uCountProfiles);
-#endif
 		}
 	}
 
drivers/dsp/bridge/rmgr/proc.c +5 -18
index c5f4577..38d6640 100644
@@ -817,9 +817,8 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc,
 	struct DMM_OBJECT *hDmmMgr;
 	u32 dwExtEnd;
 	u32 uProcId;
-#ifdef CONFIG_BRIDGE_DEBUG
 	BRD_STATUS uBrdState;
-#endif
+
 
 #ifdef OPT_LOAD_TIME_INSTRUMENTATION
 	struct timeval tv1;
@@ -1015,7 +1014,6 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc,
 	/* Restore the original argv[0] */
 	kfree(newEnvp);
 	aArgv[0] = pargv0;
-#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_SUCCEEDED(status)) {
 		if (DSP_SUCCEEDED((*pProcObject->pIntfFxns->pfnBrdStatus)
 		   (pProcObject->hWmdContext, &uBrdState))) {
@@ -1023,12 +1021,11 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc,
 			DBC_Assert(uBrdState == BRD_LOADED);
 		}
 	}
-#endif
+
 func_end:
-#ifdef CONFIG_BRIDGE_DEBUG
 	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));
 #ifdef OPT_LOAD_TIME_INSTRUMENTATION
@@ -1218,9 +1215,8 @@ DSP_STATUS PROC_Start(DSP_HPROCESSOR hProcessor)
 	struct PROC_OBJECT *pProcObject = (struct PROC_OBJECT *)hProcessor;
 	struct COD_MANAGER *hCodMgr;	/* Code manager handle    */
 	u32 dwDspAddr;	/* Loaded code's entry point.    */
-#ifdef CONFIG_BRIDGE_DEBUG
 	BRD_STATUS uBrdState;
-#endif
+
 	DBC_Require(cRefs > 0);
 	if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) {
 		status = DSP_EHANDLE;
@@ -1264,7 +1260,6 @@ DSP_STATUS PROC_Start(DSP_HPROCESSOR hProcessor)
 		pProcObject->sState = PROC_STOPPED;
 	}
 func_cont:
-#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_SUCCEEDED(status)) {
 		if (DSP_SUCCEEDED((*pProcObject->pIntfFxns->pfnBrdStatus)
 		   (pProcObject->hWmdContext, &uBrdState))) {
@@ -1274,7 +1269,7 @@ func_cont:
 	} else {
 		pr_err("%s: Failed to start the dsp\n", __func__);
 	}
-#endif
+
 func_end:
 	DBC_Ensure((DSP_SUCCEEDED(status) && pProcObject->sState ==
 		  PROC_RUNNING)	|| DSP_FAILED(status));
@@ -1334,12 +1329,10 @@ DSP_STATUS PROC_Stop(DSP_HPROCESSOR hProcessor)
 				MSG_Delete(hMsgMgr);
 				DEV_SetMsgMgr(pProcObject->hDevObject, NULL);
 			}
-#ifdef CONFIG_BRIDGE_DEBUG
 			if (DSP_SUCCEEDED((*pProcObject->pIntfFxns->
 			   pfnBrdStatus)(pProcObject->hWmdContext,
 			   &uBrdState)))
 				DBC_Assert(uBrdState == BRD_STOPPED);
-#endif
 		}
 	} else {
 		pr_err("%s: Failed to stop the processor\n", __func__);
@@ -1447,9 +1440,7 @@ static DSP_STATUS PROC_Monitor(struct PROC_OBJECT *hProcObject)
 	DSP_STATUS status = DSP_EFAIL;
 	struct PROC_OBJECT *pProcObject = (struct PROC_OBJECT *)hProcObject;
 	struct MSG_MGR *hMsgMgr;
-#ifdef CONFIG_BRIDGE_DEBUG
 	BRD_STATUS uBrdState;
-#endif
 
 	DBC_Require(cRefs > 0);
 	DBC_Require(MEM_IsValidHandle(pProcObject, PROC_SIGNATURE));
@@ -1469,17 +1460,13 @@ static DSP_STATUS PROC_Monitor(struct PROC_OBJECT *hProcObject)
 	if (DSP_SUCCEEDED((*pProcObject->pIntfFxns->pfnBrdMonitor)
 	   (pProcObject->hWmdContext))) {
 		status = DSP_SOK;
-#ifdef CONFIG_BRIDGE_DEBUG
 		if (DSP_SUCCEEDED((*pProcObject->pIntfFxns->pfnBrdStatus)
 		   (pProcObject->hWmdContext, &uBrdState)))
 			DBC_Assert(uBrdState == BRD_IDLE);
-#endif
 	}
 
-#ifdef CONFIG_BRIDGE_DEBUG
 	DBC_Ensure((DSP_SUCCEEDED(status) && uBrdState == BRD_IDLE) ||
 		  DSP_FAILED(status));
-#endif
 	return status;
 }
 
drivers/dsp/bridge/services/cfg.c +1 -12
index 1b7e0ea..4f8896a 100644
@@ -99,10 +99,8 @@ DSP_STATUS CFG_GetDevObject(struct CFG_DEVNODE *hDevNode, OUT u32 *pdwValue)
 			status = REG_GetValue("DEVICE_DSP", (u8 *)pdwValue,
 					      &dwBufSize);
 	}
-#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_FAILED(status))
 		pr_err("%s: Failed, status 0x%x\n", __func__, status);
-#endif
 	return status;
 }
 
@@ -129,14 +127,12 @@ DSP_STATUS CFG_GetDSPResources(struct CFG_DEVNODE *hDevNode,
 		status = CFG_E_RESOURCENOTAVAIL;
 		pr_err("%s: Failed, status 0x%x\n", __func__, status);
 	}
-#ifdef CONFIG_BRIDGE_DEBUG
 	/* assert that resource values are reasonable */
 	DBC_Assert(pDSPResTable->uChipType < 256);
 	DBC_Assert(pDSPResTable->uWordSize > 0);
 	DBC_Assert(pDSPResTable->uWordSize < 32);
 	DBC_Assert(pDSPResTable->cChips > 0);
 	DBC_Assert(pDSPResTable->cChips < 256);
-#endif
 	return status;
 }
 
@@ -164,10 +160,8 @@ DSP_STATUS CFG_GetExecFile(struct CFG_DEVNODE *hDevNode, u32 ulBufSize,
 			status = DSP_ESIZE;
 
 	}
-#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_FAILED(status))
 		pr_err("%s: Failed, status 0x%x\n", __func__, status);
-#endif
 	DBC_Ensure(((status == DSP_SOK) &&
 		(strlen(pstrExecFile) <= ulBufSize)) || (status != DSP_SOK));
 	return status;
@@ -197,10 +191,8 @@ DSP_STATUS CFG_GetHostResources(struct CFG_DEVNODE *hDevNode,
 			status = CFG_E_RESOURCENOTAVAIL;
 		}
 	}
-#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_FAILED(status))
 		dev_dbg(bridge, "%s Failed, status 0x%x\n", __func__, status);
-#endif
 	return status;
 }
 
@@ -284,10 +276,9 @@ DSP_STATUS CFG_SetDevObject(struct CFG_DEVNODE *hDevNode, u32 dwValue)
 						dwBuffSize);
 		}
 	}
-#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_FAILED(status))
 		pr_err("%s: Failed, status 0x%x\n", __func__, status);
-#endif
+
 	return status;
 }
 
@@ -312,9 +303,7 @@ DSP_STATUS CFG_SetObject(u32 dwValue, u32 dwType)
 	default:
 		break;
 	}
-#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_FAILED(status))
 		pr_err("%s: Failed, status 0x%x\n", __func__, status);
-#endif
 	return status;
 }
drivers/dsp/bridge/wmd/io_sm.c +0 -5
index e863478..46d5d8f 100644
@@ -1875,7 +1875,6 @@ void PrintDSPDebugTrace(struct IO_MGR *hIOMgr)
  *      There are no more than ulNumWords extra characters needed (the number of
  *      linefeeds minus the number of NULLS in the input buffer).
  */
-#if (defined(CONFIG_BRIDGE_DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE
 static DSP_STATUS PackTraceBuffer(char *lpBuf, u32 nBytes, u32 ulNumWords)
 {
 	DSP_STATUS status = DSP_SOK;
@@ -1921,7 +1920,6 @@ static DSP_STATUS PackTraceBuffer(char *lpBuf, u32 nBytes, u32 ulNumWords)
 
 	return status;
 }
-#endif    /* (CONFIG_BRIDGE_DEBUG || DDSP_DEBUG_PRODUCT) && GT_TRACE */
 
 /*
  *  ======== PrintDspTraceBuffer ========
@@ -1938,8 +1936,6 @@ static DSP_STATUS PackTraceBuffer(char *lpBuf, u32 nBytes, u32 ulNumWords)
 DSP_STATUS PrintDspTraceBuffer(struct WMD_DEV_CONTEXT *hWmdContext)
 {
 	DSP_STATUS status = DSP_SOK;
-
-#if (defined(CONFIG_BRIDGE_DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE
 	struct COD_MANAGER *hCodMgr;
 	u32 ulTraceEnd;
 	u32 ulTraceBegin;
@@ -2000,7 +1996,6 @@ DSP_STATUS PrintDspTraceBuffer(struct WMD_DEV_CONTEXT *hWmdContext)
 			  status = DSP_EMEMORY;
 		}
 	}
-#endif
 	return status;
 }
 
drivers/dsp/bridge/wmd/tiomap3430_pwr.c +0 -14
index 16e786a..9abe545 100644
@@ -270,15 +270,6 @@ DSP_STATUS WakeDSP(struct WMD_DEV_CONTEXT *pDevContext, IN void *pArgs)
 {
 	DSP_STATUS status = DSP_SOK;
 #ifdef CONFIG_PM
-#ifdef CONFIG_BRIDGE_DEBUG
-	enum HW_PwrState_t pwrState;
-	struct CFG_HOSTRES resources;
-
-	status = CFG_GetHostResources(
-		 (struct CFG_DEVNODE *)DRV_GetFirstDevExtension(), &resources);
-	if (DSP_FAILED(status))
-		return status;
-#endif /* CONFIG_BRIDGE_DEBUG */
 
 	/* Check the BRD/WMD state, if it is not 'SLEEP' then return failure */
 	if (pDevContext->dwBrdState == BRD_RUNNING ||
@@ -291,11 +282,6 @@ DSP_STATUS WakeDSP(struct WMD_DEV_CONTEXT *pDevContext, IN void *pArgs)
 	/* Send a wakeup message to DSP */
 	CHNLSM_InterruptDSP2(pDevContext, MBX_PM_DSPWAKEUP);
 
-#ifdef CONFIG_BRIDGE_DEBUG
-	HW_PWR_IVA2StateGet(resources.dwPrmBase, HW_PWR_DOMAIN_DSP,
-			&pwrState);
-#endif /* CONFIG_BRIDGE_DEBUG */
-
 	/* Set the device state to RUNNIG */
 	pDevContext->dwBrdState = BRD_RUNNING;
 #endif /* CONFIG_PM */
Signature · 1 line
1.6.2.4
#13 lore raw
In reply to Omar Ramirez Luna
Quoted 69 lines · Omar

Step 2 to remove custom debug tracing.

This set of patches gets rid of GT_* and DBG_* functionality, and replaces them to use dev_dbg instead.

This is meant to be a follow up of previous debug removal patches.

More info on dynamic_debug:
http://lwn.net/Articles/286191/

Omar Ramirez Luna (12):
DSPBRIDGE: global bridge device
DSPBRIDGE: Change custom GT_trace for dev_dbg
DSPBRIDGE: Change custom GT_trace for dev_dbg in wmd
DSPBRIDGE: Change custom GT_trace for dev_dbg in pmgr
DSPBRIDGE: Change custom GT_trace for dev_dbg in services
DSPBRIDGE: Remove GT_trace variables for rmgr
DSPBRIDGE: Remove GT_trace variables for wmd
DSPBRIDGE: Remove GT_trace variables for pmgr
DSPBRIDGE: Remove GT_trace variables for services
DSPBRIDGE: Remove custom debugging implementation
DSPBRIDGE: Remove debug header files
DSPBRIDGE: Remove unused instances of CONFIG_BRIDGE_DEBUG

  arch/arm/plat-omap/include/dspbridge/dbc.h     |    2 -
  arch/arm/plat-omap/include/dspbridge/dbg.h     |   89 -------
  arch/arm/plat-omap/include/dspbridge/gt.h      |  308 ----------------------
  arch/arm/plat-omap/include/dspbridge/host_os.h |    1 +
  drivers/dsp/bridge/Makefile                    |    4 +-
  drivers/dsp/bridge/gen/_gt_para.c              |   95 -------
  drivers/dsp/bridge/gen/gt.c                    |  336 ------------------------
  drivers/dsp/bridge/pmgr/chnl.c                 |   11 -
  drivers/dsp/bridge/pmgr/cmm.c                  |   19 +-
  drivers/dsp/bridge/pmgr/cod.c                  |   15 +-
  drivers/dsp/bridge/pmgr/dbll.c                 |   75 ++----
  drivers/dsp/bridge/pmgr/dev.c                  |    8 -
  drivers/dsp/bridge/pmgr/dmm.c                  |   58 ++---
  drivers/dsp/bridge/pmgr/io.c                   |   10 -
  drivers/dsp/bridge/pmgr/msg.c                  |   13 +-
  drivers/dsp/bridge/pmgr/wcd.c                  |    7 -
  drivers/dsp/bridge/rmgr/dbdcd.c                |   32 +--
  drivers/dsp/bridge/rmgr/disp.c                 |   69 ++----
  drivers/dsp/bridge/rmgr/drv.c                  |   96 +++----
  drivers/dsp/bridge/rmgr/drv_interface.c        |   55 ++---
  drivers/dsp/bridge/rmgr/dspdrv.c               |   14 +-
  drivers/dsp/bridge/rmgr/mgr.c                  |   31 +--
  drivers/dsp/bridge/rmgr/nldr.c                 |   43 +---
  drivers/dsp/bridge/rmgr/node.c                 |  118 +++------
  drivers/dsp/bridge/rmgr/proc.c                 |   94 ++-----
  drivers/dsp/bridge/rmgr/rmm.c                  |   11 -
  drivers/dsp/bridge/rmgr/strm.c                 |   45 ++--
  drivers/dsp/bridge/services/cfg.c              |   23 +--
  drivers/dsp/bridge/services/clk.c              |   12 +-
  drivers/dsp/bridge/services/dbg.c              |   88 ------
  drivers/dsp/bridge/services/mem.c              |    6 -
  drivers/dsp/bridge/services/ntfy.c             |    8 -
  drivers/dsp/bridge/services/reg.c              |    7 -
  drivers/dsp/bridge/services/regsup.c           |   26 +--
  drivers/dsp/bridge/services/services.c         |   21 +--
  drivers/dsp/bridge/services/sync.c             |    8 -
  drivers/dsp/bridge/wmd/chnl_sm.c               |    5 +-
  drivers/dsp/bridge/wmd/io_sm.c                 |  119 ++++-----
  drivers/dsp/bridge/wmd/mmu_fault.c             |   10 +-
  drivers/dsp/bridge/wmd/tiomap3430.c            |  134 +++++------
  drivers/dsp/bridge/wmd/tiomap3430_pwr.c        |   64 ++----
  drivers/dsp/bridge/wmd/tiomap_io.c             |    1 -
  drivers/dsp/bridge/wmd/tiomap_sm.c             |    6 +-
  drivers/dsp/bridge/wmd/ue_deh.c                |    6 +-
  44 files changed, 406 insertions(+), 1797 deletions(-)
Quoted 7 lines

delete mode 100644 arch/arm/plat-omap/include/dspbridge/dbg.h delete mode 100644 arch/arm/plat-omap/include/dspbridge/gt.h delete mode 100644 drivers/dsp/bridge/gen/_gt_para.c delete mode 100644 drivers/dsp/bridge/gen/gt.c delete mode 100644 drivers/dsp/bridge/services/dbg.c create mode 100644 drivers/dsp/bridge/uTimeout

removed bogus file: create mode 100644 drivers/dsp/bridge/uTimeout from patch [02/12] DSPBRIDGE: Change custom GT_trace for dev_dbg

Included as part of the set:
DSPBRIDGE: Remove GT_TRACE conditional macro
http://marc.info/?l=linux-omap&m=126694528710256&w=2

Rebased and pushed to dspbridge

- omar