All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/6] DSPBRIDGE: fixes from current patch queue
@ 2010-01-19 20:54 Omar Ramirez Luna
  2010-01-19 20:54 ` [PATCH 1/6] DSPBRIDGE: Rename DEBUG define to use menuconfig style Omar Ramirez Luna
  2010-01-20 22:53 ` [PATCH 0/6] DSPBRIDGE: fixes from current patch queue Ramirez Luna, Omar
  0 siblings, 2 replies; 10+ messages in thread
From: Omar Ramirez Luna @ 2010-01-19 20:54 UTC (permalink / raw)
  To: linux-omap
  Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
	Omar Ramirez Luna

Fixes and cleanups accumulated due to baseline sync.

This set should be applied after "Return right error codes" patch set.

Fernando Guzman Lugo (4):
  DSPBRIDGE: remove NLDR_Free wrapper function
  DSPBRIDGE: Optimize remove resource functions
  DSPBRIDGE: remove wrong comment from RequestBridgeResources
  DSPBRIDGE: Always print DSP traces

Omar Ramirez Luna (2):
  DSPBRIDGE: Rename DEBUG define to use menuconfig style
  DSPBRIDGE: Remove unused variables from resource cleanup

 arch/arm/plat-omap/include/dspbridge/dbg.h         |    4 +-
 arch/arm/plat-omap/include/dspbridge/nldr.h        |    1 -
 arch/arm/plat-omap/include/dspbridge/nldrdefs.h    |    1 -
 .../plat-omap/include/dspbridge/resourcecleanup.h  |    3 +-
 drivers/dsp/bridge/Makefile                        |    2 +-
 drivers/dsp/bridge/gen/_gt_para.c                  |    2 +-
 drivers/dsp/bridge/gen/gt.c                        |    2 +-
 drivers/dsp/bridge/rmgr/drv.c                      |   98 ++++++++------------
 drivers/dsp/bridge/rmgr/drv_interface.c            |    4 +-
 drivers/dsp/bridge/rmgr/nldr.c                     |   19 +---
 drivers/dsp/bridge/rmgr/node.c                     |   13 +--
 drivers/dsp/bridge/rmgr/proc.c                     |   18 ++--
 drivers/dsp/bridge/rmgr/strm.c                     |    4 +-
 drivers/dsp/bridge/services/cfg.c                  |   14 ++--
 drivers/dsp/bridge/services/dbg.c                  |    4 +-
 drivers/dsp/bridge/services/mem.c                  |    2 +-
 drivers/dsp/bridge/wmd/io_sm.c                     |   10 +-
 17 files changed, 82 insertions(+), 119 deletions(-)


^ permalink raw reply	[flat|nested] 10+ messages in thread
* [PATCH 1/6] DSPBRIDGE: Rename DEBUG define to use menuconfig style
  2010-01-19 20:54 [PATCH 0/6] DSPBRIDGE: fixes from current patch queue Omar Ramirez Luna
@ 2010-01-19 20:54 ` Omar Ramirez Luna
  2010-01-19 20:54   ` [PATCH 2/6] DSPBRIDGE: remove NLDR_Free wrapper function Omar Ramirez Luna
  2010-01-20 22:53 ` [PATCH 0/6] DSPBRIDGE: fixes from current patch queue Ramirez Luna, Omar
  1 sibling, 1 reply; 10+ messages in thread
From: Omar Ramirez Luna @ 2010-01-19 20:54 UTC (permalink / raw)
  To: linux-omap
  Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
	Omar Ramirez Luna

Rename DEBUG to CONFIG_BRIDGE_DEBUG on preprocessor conditions
that trigger debug statements.

This was conflicting with pr_debug/dev_dbg definitions.

Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
 arch/arm/plat-omap/include/dspbridge/dbg.h |    4 ++--
 drivers/dsp/bridge/Makefile                |    2 +-
 drivers/dsp/bridge/gen/_gt_para.c          |    2 +-
 drivers/dsp/bridge/gen/gt.c                |    2 +-
 drivers/dsp/bridge/rmgr/drv_interface.c    |    4 ++--
 drivers/dsp/bridge/rmgr/nldr.c             |    4 ++--
 drivers/dsp/bridge/rmgr/node.c             |   10 +++++-----
 drivers/dsp/bridge/rmgr/proc.c             |   18 +++++++++---------
 drivers/dsp/bridge/services/cfg.c          |   14 +++++++-------
 drivers/dsp/bridge/services/dbg.c          |    4 ++--
 drivers/dsp/bridge/services/mem.c          |    2 +-
 drivers/dsp/bridge/wmd/io_sm.c             |    6 +++---
 12 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/arch/arm/plat-omap/include/dspbridge/dbg.h b/arch/arm/plat-omap/include/dspbridge/dbg.h
index 5945c29..2f61dab 100644
--- a/arch/arm/plat-omap/include/dspbridge/dbg.h
+++ b/arch/arm/plat-omap/include/dspbridge/dbg.h
@@ -31,7 +31,7 @@
 #define DBG_LEVEL6  (u8)(0x40)	/* Warn SERVICES Failures */
 #define DBG_LEVEL7  (u8)(0x80)	/* Warn Critical Errors */
 
-#if (defined(DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE
+#if (defined(CONFIG_BRIDGE_DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE
 
 /*
  *  ======== DBG_Exit ========
@@ -84,6 +84,6 @@
 #define DBG_Init(void) true
 #define DBG_Trace(bLevel, pstrFormat, args...)
 
-#endif	     /* (defined(DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE */
+#endif	/* (CONFIG_BRIDGE_DEBUG || DDSP_DEBUG_PRODUCT) && GT_TRACE */
 
 #endif				/* DBG_ */
diff --git a/drivers/dsp/bridge/Makefile b/drivers/dsp/bridge/Makefile
index df870c9..0fa9245 100644
--- a/drivers/dsp/bridge/Makefile
+++ b/drivers/dsp/bridge/Makefile
@@ -22,7 +22,7 @@ bridgedriver-objs = $(libgen) $(libservices) $(libwmd) $(libpmgr) $(librmgr) \
 
 # Debug
 ifeq ($(CONFIG_BRIDGE_DEBUG),y)
-ccflags-y += -DGT_TRACE -DDEBUG
+ccflags-y += -DGT_TRACE
 endif
 
 #Machine dependent
diff --git a/drivers/dsp/bridge/gen/_gt_para.c b/drivers/dsp/bridge/gen/_gt_para.c
index f676d3f..1bb82b1 100644
--- a/drivers/dsp/bridge/gen/_gt_para.c
+++ b/drivers/dsp/bridge/gen/_gt_para.c
@@ -80,7 +80,7 @@ static void error(char *fmt, ...)
 	pr_err("ERROR: ");
 	printk(fmt, arg1, arg2, arg3, arg4, arg5, arg6);
 
-#if defined(DEBUG) || defined(DDSP_DEBUG_PRODUCT)
+#if defined(CONFIG_BRIDGE_DEBUG) || defined(DDSP_DEBUG_PRODUCT)
 	if (in_interrupt()) {
 		printk(KERN_INFO "Not stopping after error since ISR/DPC "
 			"are disabled\n");
diff --git a/drivers/dsp/bridge/gen/gt.c b/drivers/dsp/bridge/gen/gt.c
index f2fbea1..40bed53 100644
--- a/drivers/dsp/bridge/gen/gt.c
+++ b/drivers/dsp/bridge/gen/gt.c
@@ -226,7 +226,7 @@ s32 _GT_trace(struct GT_Mask *mask, char *format, ...)
 	arg6 = va_arg(va, s32);
 
 	va_end(va);
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	if (GT->PIDFXN == NULL) {
 		printk(GT_1format, mask->modName, GT->TIDFXN ?
 		(*GT->TIDFXN)() : 0);
diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index d8fe250..a02a32a 100644
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -121,7 +121,7 @@ static int omap34xxbridge_suspend_lockout(
 }
 #endif
 
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 module_param(GT_str, charp, 0);
 MODULE_PARM_DESC(GT_str, "GT string, default = NULL");
 
@@ -274,7 +274,7 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev)
 	GT_init();
 	GT_create(&driverTrace, "LD");
 
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	if (GT_str)
 		GT_set(GT_str);
 #elif defined(DDSP_DEBUG_PRODUCT) && GT_TRACE
diff --git a/drivers/dsp/bridge/rmgr/nldr.c b/drivers/dsp/bridge/rmgr/nldr.c
index 19861bd..8d136ae 100644
--- a/drivers/dsp/bridge/rmgr/nldr.c
+++ b/drivers/dsp/bridge/rmgr/nldr.c
@@ -24,7 +24,7 @@
 
 #include <dspbridge/dbc.h>
 #include <dspbridge/gt.h>
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 #include <dspbridge/dbg.h>
 #endif
 
@@ -563,7 +563,7 @@ 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 DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 				DBG_Trace(DBG_LEVEL7,
 				    "** (proc) DLL MEMSEGMENT: %d, Base: 0x%x, "
 				    "Length: 0x%x\n", i, rmmSegs[i].base,
diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c
index 7fd9977..2e24923 100644
--- a/drivers/dsp/bridge/rmgr/node.c
+++ b/drivers/dsp/bridge/rmgr/node.c
@@ -54,7 +54,7 @@
 
 /*  ----------------------------------- Others */
 #include <dspbridge/gb.h>
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 #include <dspbridge/uuidutil.h>
 #include <dspbridge/dbg.h>
 #endif
@@ -3086,7 +3086,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 DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	char szUuid[MAXUUIDLEN];
 #endif
 
@@ -3096,7 +3096,7 @@ static DSP_STATUS GetNodeProps(struct DCD_MANAGER *hDcdMgr,
 	if (DSP_SUCCEEDED(status)) {
 		hNode->nType = nodeType = pndbProps->uNodeType;
 
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 		/* Create UUID value to set in registry. */
 		UUID_UuidToString((struct DSP_UUID *)pNodeId, szUuid,
 				 MAXUUIDLEN);
@@ -3110,7 +3110,7 @@ static DSP_STATUS GetNodeProps(struct DCD_MANAGER *hDcdMgr,
 			pMsgArgs->uNotifyType = pdcdProps->objData.nodeObj.
 						uMsgNotifyType;
 			pMsgArgs->uMaxMessages = pndbProps->uMessageDepth;
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 			DBG_Trace(DBG_LEVEL7,
 				 "** (node) Max Number of Messages: 0x%x\n",
 				 pMsgArgs->uMaxMessages);
@@ -3137,7 +3137,7 @@ static DSP_STATUS GetNodeProps(struct DCD_MANAGER *hDcdMgr,
 			pTaskArgs->uStackSize = pndbProps->uStackSize;
 			pTaskArgs->uSysStackSize = pndbProps->uSysStackSize;
 			pTaskArgs->uStackSeg = pndbProps->uStackSeg;
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 			DBG_Trace(DBG_LEVEL7,
 				"** (node) Priority: 0x%x\n" "** (node) Stack"
 				" Size: 0x%x words\n" "** (node) System Stack"
diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
index fd8fdbc..cd32561 100644
--- a/drivers/dsp/bridge/rmgr/proc.c
+++ b/drivers/dsp/bridge/rmgr/proc.c
@@ -948,7 +948,7 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc,
 	struct DMM_OBJECT *hDmmMgr;
 	u32 dwExtEnd;
 	u32 uProcId;
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	BRD_STATUS uBrdState;
 #endif
 
@@ -1202,7 +1202,7 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc,
 	/* Restore the original argv[0] */
 	MEM_Free(newEnvp);
 	aArgv[0] = pargv0;
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_SUCCEEDED(status)) {
 		if (DSP_SUCCEEDED((*pProcObject->pIntfFxns->pfnBrdStatus)
 		   (pProcObject->hWmdContext, &uBrdState))) {
@@ -1213,7 +1213,7 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc,
 	}
 #endif
 func_end:
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_FAILED(status)) {
 		GT_0trace(PROC_DebugMask, GT_1CLASS, "PROC_Load: "
 			 "Processor Load Failed.\n");
@@ -1441,7 +1441,7 @@ 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 DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	BRD_STATUS uBrdState;
 #endif
 	DBC_Require(cRefs > 0);
@@ -1505,7 +1505,7 @@ DSP_STATUS PROC_Start(DSP_HPROCESSOR hProcessor)
 			 "Failed to Create the Node Manager\n");
 	}
 func_cont:
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_SUCCEEDED(status)) {
 		if (DSP_SUCCEEDED((*pProcObject->pIntfFxns->pfnBrdStatus)
 		   (pProcObject->hWmdContext, &uBrdState))) {
@@ -1583,7 +1583,7 @@ DSP_STATUS PROC_Stop(DSP_HPROCESSOR hProcessor)
 				MSG_Delete(hMsgMgr);
 				DEV_SetMsgMgr(pProcObject->hDevObject, NULL);
 			}
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 			if (DSP_SUCCEEDED((*pProcObject->pIntfFxns->
 			   pfnBrdStatus)(pProcObject->hWmdContext,
 			   &uBrdState))) {
@@ -1729,7 +1729,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 DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	BRD_STATUS uBrdState;
 #endif
 
@@ -1753,7 +1753,7 @@ static DSP_STATUS PROC_Monitor(struct PROC_OBJECT *hProcObject)
 	if (DSP_SUCCEEDED((*pProcObject->pIntfFxns->pfnBrdMonitor)
 	   (pProcObject->hWmdContext))) {
 		status = DSP_SOK;
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 		if (DSP_SUCCEEDED((*pProcObject->pIntfFxns->pfnBrdStatus)
 		   (pProcObject->hWmdContext, &uBrdState))) {
 			GT_0trace(PROC_DebugMask, GT_1CLASS,
@@ -1771,7 +1771,7 @@ static DSP_STATUS PROC_Monitor(struct PROC_OBJECT *hProcObject)
 	GT_1trace(PROC_DebugMask, GT_ENTER,
 		 "Exiting PROC_Monitor, status  0x%x\n",
 		 status);
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	DBC_Ensure((DSP_SUCCEEDED(status) && uBrdState == BRD_IDLE) ||
 		  DSP_FAILED(status));
 #endif
diff --git a/drivers/dsp/bridge/services/cfg.c b/drivers/dsp/bridge/services/cfg.c
index 4cdc4a3..7df98d1 100644
--- a/drivers/dsp/bridge/services/cfg.c
+++ b/drivers/dsp/bridge/services/cfg.c
@@ -76,7 +76,7 @@ DSP_STATUS CFG_GetAutoStart(struct CFG_DEVNODE *hDevNode,
 		if (DSP_FAILED(status))
 			status = CFG_E_RESOURCENOTAVAIL;
 	}
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_SUCCEEDED(status)) {
 		GT_0trace(CFG_debugMask, GT_1CLASS,
 			 "CFG_GetAutoStart SUCCESS \n");
@@ -125,7 +125,7 @@ DSP_STATUS CFG_GetDevObject(struct CFG_DEVNODE *hDevNode, OUT u32 *pdwValue)
 				  "Failed to Identify the Device to Fetch \n");
 		}
 	}
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_SUCCEEDED(status)) {
 		GT_1trace(CFG_debugMask, GT_1CLASS,
 			  "CFG_GetDevObject SUCCESS DevObject"
@@ -168,7 +168,7 @@ DSP_STATUS CFG_GetDSPResources(struct CFG_DEVNODE *hDevNode,
 		GT_0trace(CFG_debugMask, GT_6CLASS,
 			  "CFG_GetDSPResources Failed \n");
 	}
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	/* assert that resource values are reasonable */
 	DBC_Assert(pDSPResTable->uChipType < 256);
 	DBC_Assert(pDSPResTable->uWordSize > 0);
@@ -206,7 +206,7 @@ DSP_STATUS CFG_GetExecFile(struct CFG_DEVNODE *hDevNode, u32 ulBufSize,
 			status = DSP_ESIZE;
 
 	}
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_SUCCEEDED(status)) {
 		GT_1trace(CFG_debugMask, GT_1CLASS,
 			  "CFG_GetExecFile SUCCESS Exec File"
@@ -248,7 +248,7 @@ DSP_STATUS CFG_GetHostResources(struct CFG_DEVNODE *hDevNode,
 			status = CFG_E_RESOURCENOTAVAIL;
 		}
 	}
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_SUCCEEDED(status)) {
 		GT_0trace(CFG_debugMask, GT_1CLASS,
 			  "CFG_GetHostResources SUCCESS \n");
@@ -361,7 +361,7 @@ DSP_STATUS CFG_SetDevObject(struct CFG_DEVNODE *hDevNode, u32 dwValue)
 				  "Failed to Register Device \n");
 		}
 	}
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_SUCCEEDED(status)) {
 		GT_0trace(CFG_debugMask, GT_1CLASS,
 			  "CFG_SetDevObject SUCCESS \n");
@@ -396,7 +396,7 @@ DSP_STATUS CFG_SetObject(u32 dwValue, u32 dwType)
 	default:
 		break;
 	}
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 	if (DSP_SUCCEEDED(status))
 		GT_0trace(CFG_debugMask, GT_1CLASS, "CFG_SetObject SUCCESS \n");
 	else
diff --git a/drivers/dsp/bridge/services/dbg.c b/drivers/dsp/bridge/services/dbg.c
index bc5c8cd..93fd817 100644
--- a/drivers/dsp/bridge/services/dbg.c
+++ b/drivers/dsp/bridge/services/dbg.c
@@ -33,7 +33,7 @@
 static struct GT_Mask DBG_debugMask = { NULL, NULL };	/* GT trace var. */
 #endif
 
-#if (defined(DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE
+#if (defined(CONFIG_BRIDGE_DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE
 
 /*
  *  ======== DBG_Init ========
@@ -87,4 +87,4 @@ void DBG_Exit(void)
 	GT_0trace(DBG_debugMask, GT_5CLASS, "DBG_Exit\n");
 }
 
-#endif	/* (defined(DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE */
+#endif	/* (CONFIG_BRIDGE_DEBUG || DDSP_DEBUG_PRODUCT) && GT_TRACE */
diff --git a/drivers/dsp/bridge/services/mem.c b/drivers/dsp/bridge/services/mem.c
index 79d32f5..2aff2d2 100644
--- a/drivers/dsp/bridge/services/mem.c
+++ b/drivers/dsp/bridge/services/mem.c
@@ -36,7 +36,7 @@
 #define MEM_512MB   0x1fffffff
 #define memInfoSign 0x464E494D	/* "MINF" (in reverse). */
 
-#ifdef DEBUG
+#ifdef CONFIG_BRIDGE_DEBUG
 #define MEM_CHECK		/* Use to detect source of memory leaks */
 #endif
 
diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c
index edb83c1..d267cab 100644
--- a/drivers/dsp/bridge/wmd/io_sm.c
+++ b/drivers/dsp/bridge/wmd/io_sm.c
@@ -1952,7 +1952,7 @@ 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(DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE
+#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;
@@ -2000,7 +2000,7 @@ static DSP_STATUS PackTraceBuffer(char *lpBuf, u32 nBytes, u32 ulNumWords)
 
 	return status;
 }
-#endif    /* (defined(DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE */
+#endif    /* (CONFIG_BRIDGE_DEBUG || DDSP_DEBUG_PRODUCT) && GT_TRACE */
 
 /*
  *  ======== PrintDspTraceBuffer ========
@@ -2018,7 +2018,7 @@ DSP_STATUS PrintDspTraceBuffer(struct WMD_DEV_CONTEXT *hWmdContext)
 {
 	DSP_STATUS status = DSP_SOK;
 
-#if (defined(DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE
+#if (defined(CONFIG_BRIDGE_DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE
 	struct COD_MANAGER *hCodMgr;
 	u32 ulTraceEnd;
 	u32 ulTraceBegin;
-- 
1.6.2.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH 2/6] DSPBRIDGE: remove NLDR_Free wrapper function
  2010-01-19 20:54 ` [PATCH 1/6] DSPBRIDGE: Rename DEBUG define to use menuconfig style Omar Ramirez Luna
@ 2010-01-19 20:54   ` Omar Ramirez Luna
  2010-01-19 20:54     ` [PATCH 3/6] DSPBRIDGE: Optimize remove resource functions Omar Ramirez Luna
  0 siblings, 1 reply; 10+ messages in thread
From: Omar Ramirez Luna @ 2010-01-19 20:54 UTC (permalink / raw)
  To: linux-omap
  Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
	Fernando Guzman Lugo, Fernando Guzman Lugo

From: Fernando Guzman Lugo <x0095840@ti.com>

This patch removes the NLDR_Free which is a wrapper function

Signed-off-by: Fernando Guzman Lugo <x0095849@ti.com>
---
 arch/arm/plat-omap/include/dspbridge/nldr.h     |    1 -
 arch/arm/plat-omap/include/dspbridge/nldrdefs.h |    1 -
 drivers/dsp/bridge/rmgr/nldr.c                  |   15 +--------------
 drivers/dsp/bridge/rmgr/node.c                  |    3 +--
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/arch/arm/plat-omap/include/dspbridge/nldr.h b/arch/arm/plat-omap/include/dspbridge/nldr.h
index 5a0538a..4f0639a 100644
--- a/arch/arm/plat-omap/include/dspbridge/nldr.h
+++ b/arch/arm/plat-omap/include/dspbridge/nldr.h
@@ -38,7 +38,6 @@
 
 	extern void NLDR_Delete(struct NLDR_OBJECT *hNldr);
 	extern void NLDR_Exit(void);
-	extern void NLDR_Free(struct NLDR_NODEOBJECT *hNldrNode);
 
 	extern DSP_STATUS NLDR_GetFxnAddr(struct NLDR_NODEOBJECT *hNldrNode,
 					  char *pstrFxn, u32 *pulAddr);
diff --git a/arch/arm/plat-omap/include/dspbridge/nldrdefs.h b/arch/arm/plat-omap/include/dspbridge/nldrdefs.h
index 18d3bb9..b0646fa 100644
--- a/arch/arm/plat-omap/include/dspbridge/nldrdefs.h
+++ b/arch/arm/plat-omap/include/dspbridge/nldrdefs.h
@@ -287,7 +287,6 @@
 		NLDR_CREATEFXN pfnCreate;
 		NLDR_DELETEFXN pfnDelete;
 		NLDR_EXITFXN pfnExit;
-		NLDR_FREEFXN pfnFree;
 		NLDR_GETFXNADDRFXN pfnGetFxnAddr;
 		NLDR_INITFXN pfnInit;
 		NLDR_LOADFXN pfnLoad;
diff --git a/drivers/dsp/bridge/rmgr/nldr.c b/drivers/dsp/bridge/rmgr/nldr.c
index 8d136ae..bdf7622 100644
--- a/drivers/dsp/bridge/rmgr/nldr.c
+++ b/drivers/dsp/bridge/rmgr/nldr.c
@@ -435,7 +435,7 @@ DSP_STATUS NLDR_Allocate(struct NLDR_OBJECT *hNldr, void *pPrivRef,
 	}
 	/* Cleanup on failure */
 	if (DSP_FAILED(status) && pNldrNode)
-		NLDR_Free((struct NLDR_NODEOBJECT *) pNldrNode);
+		MEM_FreeObject(pNldrNode);
 
 	DBC_Ensure((DSP_SUCCEEDED(status) &&
 		  MEM_IsValidHandle(((struct NLDR_NODEOBJECT *)(*phNldrNode)),
@@ -718,19 +718,6 @@ void NLDR_Exit(void)
 }
 
 /*
- *  ======== NLDR_Free ========
- */
-void NLDR_Free(struct NLDR_NODEOBJECT *hNldrNode)
-{
-	DBC_Require(cRefs > 0);
-	DBC_Require(MEM_IsValidHandle(hNldrNode, NLDR_NODESIGNATURE));
-
-	GT_1trace(NLDR_debugMask, GT_ENTER, "NLDR_Free(0x%x)\n", hNldrNode);
-
-	MEM_FreeObject(hNldrNode);
-}
-
-/*
  *  ======== NLDR_GetFxnAddr ========
  */
 DSP_STATUS NLDR_GetFxnAddr(struct NLDR_NODEOBJECT *hNldrNode, char *pstrFxn,
diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c
index 2e24923..51156bd 100644
--- a/drivers/dsp/bridge/rmgr/node.c
+++ b/drivers/dsp/bridge/rmgr/node.c
@@ -284,7 +284,6 @@ static struct NLDR_FXNS nldrFxns = {
 	NLDR_Create,
 	NLDR_Delete,
 	NLDR_Exit,
-	NLDR_Free,
 	NLDR_GetFxnAddr,
 	NLDR_Init,
 	NLDR_Load,
@@ -2810,7 +2809,7 @@ static void DeleteNode(struct NODE_OBJECT *hNode,
 	}
 
 	if (hNode->hNldrNode) {
-		hNodeMgr->nldrFxns.pfnFree(hNode->hNldrNode);
+		MEM_Free(hNode->hNldrNode);
 		hNode->hNldrNode = NULL;
 	}
 	hNode->hNodeMgr = NULL;
-- 
1.6.2.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH 3/6] DSPBRIDGE: Optimize remove resource functions
  2010-01-19 20:54   ` [PATCH 2/6] DSPBRIDGE: remove NLDR_Free wrapper function Omar Ramirez Luna
@ 2010-01-19 20:54     ` Omar Ramirez Luna
  2010-01-19 20:54       ` [PATCH 4/6] DSPBRIDGE: Remove unused variables from resource cleanup Omar Ramirez Luna
  0 siblings, 1 reply; 10+ messages in thread
From: Omar Ramirez Luna @ 2010-01-19 20:54 UTC (permalink / raw)
  To: linux-omap
  Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
	Fernando Guzman Lugo

From: Fernando Guzman Lugo <x0095840@ti.com>

This patch optimizes the remove resource functions, i.e DMM,
Stream and Nodes.
Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
---
 drivers/dsp/bridge/rmgr/drv.c |   86 +++++++++++++++++------------------------
 1 files changed, 35 insertions(+), 51 deletions(-)

diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c
index 0120989..7e85095 100644
--- a/drivers/dsp/bridge/rmgr/drv.c
+++ b/drivers/dsp/bridge/rmgr/drv.c
@@ -142,26 +142,21 @@ DSP_STATUS DRV_RemoveNodeResElement(HANDLE hNodeRes, HANDLE hPCtxt)
 {
 	struct NODE_RES_OBJECT *pNodeRes = (struct NODE_RES_OBJECT *)hNodeRes;
 	struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt;
-	DSP_STATUS	status = DSP_SOK;
-	struct NODE_RES_OBJECT *pTempNode2 = pCtxt->pNodeList;
-	struct NODE_RES_OBJECT *pTempNode = pCtxt->pNodeList;
+	struct NODE_RES_OBJECT *pTempNode;
 
 	DBC_Assert(hPCtxt != NULL);
-	GT_0trace(curTrace, GT_ENTER, "\nDRV_RemoveNodeResElement: 1\n");
-	while ((pTempNode != NULL) && (pTempNode != pNodeRes)) {
-		pTempNode2 = pTempNode;
-		pTempNode = pTempNode->next;
-	}
-	if (pCtxt->pNodeList == pNodeRes)
+	pTempNode = pCtxt->pNodeList;
+	if (pTempNode == pNodeRes) {
 		pCtxt->pNodeList = pNodeRes->next;
-
-	if (pTempNode == NULL)
-		return DSP_ENOTFOUND;
-	else if (pTempNode2->next != NULL)
-		pTempNode2->next = pTempNode2->next->next;
-
-	MEM_Free(pTempNode);
-	return status;
+	} else {
+		while (pTempNode && pTempNode->next != pNodeRes)
+			pTempNode = pTempNode->next;
+		if (!pTempNode)
+			return DSP_ENOTFOUND;
+		pTempNode->next = pNodeRes->next;
+	}
+	MEM_Free(pNodeRes);
+	return DSP_SOK;
 }
 
 /* Actual Node De-Allocation */
@@ -248,35 +243,25 @@ DSP_STATUS DRV_InsertDMMResElement(HANDLE hDMMRes, HANDLE hPCtxt)
 
 /* Release DMM resource element context
 * This is called from Proc_UnMap. after the actual resource is freed */
-DSP_STATUS 	DRV_RemoveDMMResElement(HANDLE hDMMRes, HANDLE hPCtxt)
+DSP_STATUS DRV_RemoveDMMResElement(HANDLE hDMMRes, HANDLE hPCtxt)
 {
 	struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt;
 	struct DMM_RES_OBJECT *pDMMRes = (struct DMM_RES_OBJECT *)hDMMRes;
-	DSP_STATUS status = DSP_SOK;
-	struct DMM_RES_OBJECT *pTempDMMRes2 = NULL;
 	struct DMM_RES_OBJECT *pTempDMMRes = NULL;
 
 	DBC_Assert(hPCtxt != NULL);
-	pTempDMMRes2 = pCtxt->pDMMList;
 	pTempDMMRes = pCtxt->pDMMList;
-	GT_0trace(curTrace, GT_ENTER, "DRV_RemoveDMMResElement: 1");
-	while ((pTempDMMRes != NULL) && (pTempDMMRes != pDMMRes)) {
-		GT_0trace(curTrace, GT_ENTER, "DRV_RemoveDMMResElement: 2");
-		pTempDMMRes2 = pTempDMMRes;
-		pTempDMMRes = pTempDMMRes->next;
+	if (pCtxt->pDMMList == pDMMRes) {
+		pCtxt->pDMMList = pDMMRes->next;
+	} else {
+		while (pTempDMMRes && pTempDMMRes->next != pDMMRes)
+			pTempDMMRes = pTempDMMRes->next;
+		if (!pTempDMMRes)
+			return DSP_ENOTFOUND;
+		pTempDMMRes->next = pDMMRes->next;
 	}
-	GT_0trace(curTrace, GT_ENTER, "DRV_RemoveDMMResElement: 3");
-	if (pCtxt->pDMMList == pTempDMMRes)
-		pCtxt->pDMMList = pTempDMMRes->next;
-
-	if (pTempDMMRes == NULL)
-		return DSP_ENOTFOUND;
-	else if (pTempDMMRes2->next != NULL)
-		pTempDMMRes2->next = pTempDMMRes2->next->next;
-
 	MEM_Free(pDMMRes);
-	GT_0trace(curTrace, GT_ENTER, "DRV_RemoveDMMResElement: 4");
-	return status;
+	return DSP_SOK;
 }
 
 /* Update DMM resource status */
@@ -482,25 +467,24 @@ DSP_STATUS 	DRV_ProcRemoveSTRMResElement(HANDLE hSTRMRes, HANDLE hPCtxt)
 {
 	struct STRM_RES_OBJECT *pSTRMRes = (struct STRM_RES_OBJECT *)hSTRMRes;
 	struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt;
-	DSP_STATUS status = DSP_SOK;
-	struct STRM_RES_OBJECT *pTempSTRMRes2 = pCtxt->pSTRMList;
-	struct STRM_RES_OBJECT *pTempSTRMRes = pCtxt->pSTRMList;
+	struct STRM_RES_OBJECT *pTempSTRMRes;
 
 	DBC_Assert(hPCtxt != NULL);
-	while ((pTempSTRMRes != NULL) && (pTempSTRMRes != pSTRMRes)) {
-		pTempSTRMRes2 = pTempSTRMRes;
-		pTempSTRMRes = pTempSTRMRes->next;
-	}
-	if (pCtxt->pSTRMList == pTempSTRMRes)
-		pCtxt->pSTRMList = pTempSTRMRes->next;
 
-	if (pTempSTRMRes == NULL)
-		status = DSP_ENOTFOUND;
-	else if (pTempSTRMRes2->next != NULL)
-		pTempSTRMRes2->next = pTempSTRMRes2->next->next;
+	pTempSTRMRes = pCtxt->pSTRMList;
+
+	if (pCtxt->pSTRMList == pSTRMRes) {
+		pCtxt->pSTRMList = pSTRMRes->next;
+	} else {
+		while (pTempSTRMRes && pTempSTRMRes->next != pSTRMRes)
+			pTempSTRMRes = pTempSTRMRes->next;
+		if (pTempSTRMRes == NULL)
+			return DSP_ENOTFOUND;
+		pTempSTRMRes->next = pSTRMRes->next;
+	}
 
 	MEM_Free(pSTRMRes);
-	return status;
+	return DSP_SOK;
 }
 
 /* Actual Stream De-Allocation */
-- 
1.6.2.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH 4/6] DSPBRIDGE: Remove unused variables from resource cleanup
  2010-01-19 20:54     ` [PATCH 3/6] DSPBRIDGE: Optimize remove resource functions Omar Ramirez Luna
@ 2010-01-19 20:54       ` Omar Ramirez Luna
  2010-01-19 20:54         ` [PATCH 5/6] DSPBRIDGE: remove wrong comment from RequestBridgeResources Omar Ramirez Luna
  2010-01-20 10:05         ` [PATCH 4/6] DSPBRIDGE: Remove unused variables from resource cleanup Ameya Palande
  0 siblings, 2 replies; 10+ messages in thread
From: Omar Ramirez Luna @ 2010-01-19 20:54 UTC (permalink / raw)
  To: linux-omap
  Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
	Fernando Guzman Lugo

From: Fernando Guzman Lugo <x0095840@ti.com>

This patch removes an unused variable parameter from
resource cleanup code.

Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
---
 .../plat-omap/include/dspbridge/resourcecleanup.h  |    3 +--
 drivers/dsp/bridge/rmgr/drv.c                      |    5 +----
 drivers/dsp/bridge/rmgr/strm.c                     |    4 ++--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/arch/arm/plat-omap/include/dspbridge/resourcecleanup.h b/arch/arm/plat-omap/include/dspbridge/resourcecleanup.h
index a6f4397..4ded5aa 100644
--- a/arch/arm/plat-omap/include/dspbridge/resourcecleanup.h
+++ b/arch/arm/plat-omap/include/dspbridge/resourcecleanup.h
@@ -63,8 +63,7 @@ extern DSP_STATUS DRV_GetDMMResElement(u32 pMapAddr, HANDLE dmmRes,
 
 extern DSP_STATUS DRV_RemoveDMMResElement(HANDLE dmmRes, HANDLE pCtxt);
 
-extern DSP_STATUS DRV_ProcUpdateSTRMRes(u32 uNumBufs, HANDLE STRMRes,
-					HANDLE pCtxt);
+extern DSP_STATUS DRV_ProcUpdateSTRMRes(u32 uNumBufs, HANDLE STRMRes);
 
 extern DSP_STATUS DRV_ProcInsertSTRMResElement(HANDLE hStrm, HANDLE STRMRes,
 						HANDLE pPctxt);
diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c
index 7e85095..56ceb6c 100644
--- a/drivers/dsp/bridge/rmgr/drv.c
+++ b/drivers/dsp/bridge/rmgr/drv.c
@@ -339,7 +339,6 @@ DSP_STATUS DRV_GetDMMResElement(u32 pMapAddr, HANDLE hDMMRes, HANDLE hPCtxt)
 	struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt;
 	struct DMM_RES_OBJECT **pDMMRes = (struct DMM_RES_OBJECT **)hDMMRes;
 	DSP_STATUS status = DSP_SOK;
-	struct DMM_RES_OBJECT *pTempDMM2 = NULL;
 	struct DMM_RES_OBJECT *pTempDMM = NULL;
 
 	DBC_Assert(hPCtxt != NULL);
@@ -349,7 +348,6 @@ DSP_STATUS DRV_GetDMMResElement(u32 pMapAddr, HANDLE hDMMRes, HANDLE hPCtxt)
 			 "DRV_GetDMMResElement: 2 pTempDMM:%x "
 			 "pTempDMM->ulDSPAddr:%x pMapAddr:%x\n", pTempDMM,
 			 pTempDMM->ulDSPAddr, pMapAddr);
-		pTempDMM2 = pTempDMM;
 		pTempDMM = pTempDMM->next;
 	}
 	if (pTempDMM != NULL) {
@@ -579,12 +577,11 @@ DSP_STATUS DRV_GetSTRMResElement(HANDLE hStrm, HANDLE hSTRMRes, HANDLE hPCtxt)
 }
 
 /* Updating the stream resource element */
-DSP_STATUS DRV_ProcUpdateSTRMRes(u32 uNumBufs, HANDLE hSTRMRes, HANDLE hPCtxt)
+DSP_STATUS DRV_ProcUpdateSTRMRes(u32 uNumBufs, HANDLE hSTRMRes)
 {
 	DSP_STATUS status = DSP_SOK;
 	struct STRM_RES_OBJECT **STRMRes = (struct STRM_RES_OBJECT **)hSTRMRes;
 
-	DBC_Assert(hPCtxt != NULL);
 	(*STRMRes)->uNumBufs = uNumBufs;
 	return status;
 }
diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c
index b0b4d32..febb6c2 100644
--- a/drivers/dsp/bridge/rmgr/strm.c
+++ b/drivers/dsp/bridge/rmgr/strm.c
@@ -158,7 +158,7 @@ DSP_STATUS STRM_AllocateBuffer(struct STRM_OBJECT *hStrm, u32 uSize,
 
 	if (DRV_GetSTRMResElement(hStrm, &hSTRMRes, pr_ctxt) !=
 			DSP_ENOTFOUND)
-		DRV_ProcUpdateSTRMRes(uNumBufs, hSTRMRes, pr_ctxt);
+		DRV_ProcUpdateSTRMRes(uNumBufs, hSTRMRes);
 #endif
 func_end:
 	return status;
@@ -340,7 +340,7 @@ DSP_STATUS STRM_FreeBuffer(struct STRM_OBJECT *hStrm, u8 **apBuffer,
 #ifndef RES_CLEANUP_DISABLE
 	if (DRV_GetSTRMResElement(hStrm, hSTRMRes, pr_ctxt) !=
 			DSP_ENOTFOUND)
-		DRV_ProcUpdateSTRMRes(uNumBufs-i, hSTRMRes, pr_ctxt);
+		DRV_ProcUpdateSTRMRes(uNumBufs-i, hSTRMRes);
 #endif
 	return status;
 }
-- 
1.6.2.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH 5/6] DSPBRIDGE: remove wrong comment from RequestBridgeResources
  2010-01-19 20:54       ` [PATCH 4/6] DSPBRIDGE: Remove unused variables from resource cleanup Omar Ramirez Luna
@ 2010-01-19 20:54         ` Omar Ramirez Luna
  2010-01-19 20:54           ` [PATCH 6/6] DSPBRIDGE: Always print DSP traces Omar Ramirez Luna
  2010-01-20 10:04           ` [PATCH 5/6] DSPBRIDGE: remove wrong comment from RequestBridgeResources Ameya Palande
  2010-01-20 10:05         ` [PATCH 4/6] DSPBRIDGE: Remove unused variables from resource cleanup Ameya Palande
  1 sibling, 2 replies; 10+ messages in thread
From: Omar Ramirez Luna @ 2010-01-19 20:54 UTC (permalink / raw)
  To: linux-omap
  Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
	Fernando Guzman Lugo

From: Fernando Guzman Lugo <x0095840@ti.com>

This patch removes a wrong pointer and set to NULL dwSysCtrlBase
as it shouldn't be used anymore after iounmap.

Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
---
 drivers/dsp/bridge/rmgr/drv.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c
index 56ceb6c..9b07f25 100644
--- a/drivers/dsp/bridge/rmgr/drv.c
+++ b/drivers/dsp/bridge/rmgr/drv.c
@@ -1138,11 +1138,9 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest)
 				iounmap((void *)pResources->dwPerPmBase);
 			if (pResources->dwCorePmBase)
 				iounmap((void *)pResources->dwCorePmBase);
-			if (pResources->dwSysCtrlBase) {
+			if (pResources->dwSysCtrlBase)
 				iounmap(pResources->dwSysCtrlBase);
-				/* don't set pResources->dwSysCtrlBase to null
-				 * as it is used in BOARD_Stop */
-			}
+
 			pResources->dwPrmBase = NULL;
 			pResources->dwCmBase = NULL;
 			pResources->dwMboxBase = NULL;
@@ -1152,6 +1150,7 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest)
 			pResources->dwMemBase[4] = (u32) NULL;
 			pResources->dwWdTimerDspBase = NULL;
 			pResources->dwDmmuBase = NULL;
+			pResources->dwSysCtrlBase = NULL;
 
 			dwBuffSize = sizeof(struct CFG_HOSTRES);
 			status = REG_SetValue(CURRENTCONFIG, (u8 *)pResources,
-- 
1.6.2.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH 6/6] DSPBRIDGE: Always print DSP traces
  2010-01-19 20:54         ` [PATCH 5/6] DSPBRIDGE: remove wrong comment from RequestBridgeResources Omar Ramirez Luna
@ 2010-01-19 20:54           ` Omar Ramirez Luna
  2010-01-20 10:04           ` [PATCH 5/6] DSPBRIDGE: remove wrong comment from RequestBridgeResources Ameya Palande
  1 sibling, 0 replies; 10+ messages in thread
From: Omar Ramirez Luna @ 2010-01-19 20:54 UTC (permalink / raw)
  To: linux-omap
  Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
	Fernando Guzman Lugo

From: Fernando Guzman Lugo <x0095840@ti.com>

This patches prints DSP traces always removing the need to
compile debug version and enable DSP traces.

Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
---
 drivers/dsp/bridge/wmd/io_sm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c
index d267cab..e35ce57 100644
--- a/drivers/dsp/bridge/wmd/io_sm.c
+++ b/drivers/dsp/bridge/wmd/io_sm.c
@@ -1905,7 +1905,7 @@ void PrintDSPDebugTrace(struct IO_MGR *hIOMgr)
 			 */
 			hIOMgr->ulGPPReadPointer += ulNewMessageLength;
 			/* Print the trace messages */
-			GT_0trace(dsp_trace_mask, GT_1CLASS, hIOMgr->pMsg);
+			pr_info("DSPTrace: %s\n", hIOMgr->pMsg);
 		} else if (ulGPPCurPointer < hIOMgr->ulGPPReadPointer) {
 			/* Handle trace buffer wraparound */
 			memcpy(hIOMgr->pMsg, (char *)hIOMgr->ulGPPReadPointer,
@@ -1927,7 +1927,7 @@ void PrintDSPDebugTrace(struct IO_MGR *hIOMgr)
 			hIOMgr->ulGPPReadPointer = hIOMgr->ulTraceBufferBegin +
 						   ulNewMessageLength;
 			/* Print the trace messages */
-			GT_0trace(dsp_trace_mask, GT_1CLASS, hIOMgr->pMsg);
+			pr_info("DSPTrace: %s\n", hIOMgr->pMsg);
 		}
 	}
 }
-- 
1.6.2.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* Re: [PATCH 5/6] DSPBRIDGE: remove wrong comment from RequestBridgeResources
  2010-01-19 20:54         ` [PATCH 5/6] DSPBRIDGE: remove wrong comment from RequestBridgeResources Omar Ramirez Luna
  2010-01-19 20:54           ` [PATCH 6/6] DSPBRIDGE: Always print DSP traces Omar Ramirez Luna
@ 2010-01-20 10:04           ` Ameya Palande
  1 sibling, 0 replies; 10+ messages in thread
From: Ameya Palande @ 2010-01-20 10:04 UTC (permalink / raw)
  To: ext Omar Ramirez Luna
  Cc: linux-omap, Doyu Hiroshi (Nokia-D/Helsinki),
	Contreras Felipe (Nokia-D/Helsinki),
	Nishanth Menon, Fernando Guzman Lugo

On Tue, 2010-01-19 at 21:54 +0100, ext Omar Ramirez Luna wrote:
> From: Fernando Guzman Lugo <x0095840@ti.com>
> 
> This patch removes a wrong pointer and set to NULL dwSysCtrlBase
> as it shouldn't be used anymore after iounmap.
> 
> Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
> ---
>  drivers/dsp/bridge/rmgr/drv.c |    7 +++----
>  1 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c
> index 56ceb6c..9b07f25 100644
> --- a/drivers/dsp/bridge/rmgr/drv.c
> +++ b/drivers/dsp/bridge/rmgr/drv.c
> @@ -1138,11 +1138,9 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest)
>  				iounmap((void *)pResources->dwPerPmBase);
>  			if (pResources->dwCorePmBase)
>  				iounmap((void *)pResources->dwCorePmBase);
> -			if (pResources->dwSysCtrlBase) {
> +			if (pResources->dwSysCtrlBase)
>  				iounmap(pResources->dwSysCtrlBase);
> -				/* don't set pResources->dwSysCtrlBase to null
> -				 * as it is used in BOARD_Stop */
> -			}
> +
>  			pResources->dwPrmBase = NULL;
>  			pResources->dwCmBase = NULL;
>  			pResources->dwMboxBase = NULL;
> @@ -1152,6 +1150,7 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest)
>  			pResources->dwMemBase[4] = (u32) NULL;
>  			pResources->dwWdTimerDspBase = NULL;
>  			pResources->dwDmmuBase = NULL;
> +			pResources->dwSysCtrlBase = NULL;
>  
>  			dwBuffSize = sizeof(struct CFG_HOSTRES);
>  			status = REG_SetValue(CURRENTCONFIG, (u8 *)pResources,

Acked-by: Ameya Palande <ameya.palande@nokia.com>


^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH 4/6] DSPBRIDGE: Remove unused variables from resource cleanup
  2010-01-19 20:54       ` [PATCH 4/6] DSPBRIDGE: Remove unused variables from resource cleanup Omar Ramirez Luna
  2010-01-19 20:54         ` [PATCH 5/6] DSPBRIDGE: remove wrong comment from RequestBridgeResources Omar Ramirez Luna
@ 2010-01-20 10:05         ` Ameya Palande
  1 sibling, 0 replies; 10+ messages in thread
From: Ameya Palande @ 2010-01-20 10:05 UTC (permalink / raw)
  To: ext Omar Ramirez Luna
  Cc: linux-omap, Doyu Hiroshi (Nokia-D/Helsinki),
	Contreras Felipe (Nokia-D/Helsinki),
	Nishanth Menon, Fernando Guzman Lugo

On Tue, 2010-01-19 at 21:54 +0100, ext Omar Ramirez Luna wrote:
> From: Fernando Guzman Lugo <x0095840@ti.com>
> 
> This patch removes an unused variable parameter from
> resource cleanup code.
> 
> Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
> ---
>  .../plat-omap/include/dspbridge/resourcecleanup.h  |    3 +--
>  drivers/dsp/bridge/rmgr/drv.c                      |    5 +----
>  drivers/dsp/bridge/rmgr/strm.c                     |    4 ++--
>  3 files changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/plat-omap/include/dspbridge/resourcecleanup.h b/arch/arm/plat-omap/include/dspbridge/resourcecleanup.h
> index a6f4397..4ded5aa 100644
> --- a/arch/arm/plat-omap/include/dspbridge/resourcecleanup.h
> +++ b/arch/arm/plat-omap/include/dspbridge/resourcecleanup.h
> @@ -63,8 +63,7 @@ extern DSP_STATUS DRV_GetDMMResElement(u32 pMapAddr, HANDLE dmmRes,
>  
>  extern DSP_STATUS DRV_RemoveDMMResElement(HANDLE dmmRes, HANDLE pCtxt);
>  
> -extern DSP_STATUS DRV_ProcUpdateSTRMRes(u32 uNumBufs, HANDLE STRMRes,
> -					HANDLE pCtxt);
> +extern DSP_STATUS DRV_ProcUpdateSTRMRes(u32 uNumBufs, HANDLE STRMRes);
>  
>  extern DSP_STATUS DRV_ProcInsertSTRMResElement(HANDLE hStrm, HANDLE STRMRes,
>  						HANDLE pPctxt);
> diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c
> index 7e85095..56ceb6c 100644
> --- a/drivers/dsp/bridge/rmgr/drv.c
> +++ b/drivers/dsp/bridge/rmgr/drv.c
> @@ -339,7 +339,6 @@ DSP_STATUS DRV_GetDMMResElement(u32 pMapAddr, HANDLE hDMMRes, HANDLE hPCtxt)
>  	struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt;
>  	struct DMM_RES_OBJECT **pDMMRes = (struct DMM_RES_OBJECT **)hDMMRes;
>  	DSP_STATUS status = DSP_SOK;
> -	struct DMM_RES_OBJECT *pTempDMM2 = NULL;
>  	struct DMM_RES_OBJECT *pTempDMM = NULL;
>  
>  	DBC_Assert(hPCtxt != NULL);
> @@ -349,7 +348,6 @@ DSP_STATUS DRV_GetDMMResElement(u32 pMapAddr, HANDLE hDMMRes, HANDLE hPCtxt)
>  			 "DRV_GetDMMResElement: 2 pTempDMM:%x "
>  			 "pTempDMM->ulDSPAddr:%x pMapAddr:%x\n", pTempDMM,
>  			 pTempDMM->ulDSPAddr, pMapAddr);
> -		pTempDMM2 = pTempDMM;
>  		pTempDMM = pTempDMM->next;
>  	}
>  	if (pTempDMM != NULL) {
> @@ -579,12 +577,11 @@ DSP_STATUS DRV_GetSTRMResElement(HANDLE hStrm, HANDLE hSTRMRes, HANDLE hPCtxt)
>  }
>  
>  /* Updating the stream resource element */
> -DSP_STATUS DRV_ProcUpdateSTRMRes(u32 uNumBufs, HANDLE hSTRMRes, HANDLE hPCtxt)
> +DSP_STATUS DRV_ProcUpdateSTRMRes(u32 uNumBufs, HANDLE hSTRMRes)
>  {
>  	DSP_STATUS status = DSP_SOK;
>  	struct STRM_RES_OBJECT **STRMRes = (struct STRM_RES_OBJECT **)hSTRMRes;
>  
> -	DBC_Assert(hPCtxt != NULL);
>  	(*STRMRes)->uNumBufs = uNumBufs;
>  	return status;
>  }
> diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c
> index b0b4d32..febb6c2 100644
> --- a/drivers/dsp/bridge/rmgr/strm.c
> +++ b/drivers/dsp/bridge/rmgr/strm.c
> @@ -158,7 +158,7 @@ DSP_STATUS STRM_AllocateBuffer(struct STRM_OBJECT *hStrm, u32 uSize,
>  
>  	if (DRV_GetSTRMResElement(hStrm, &hSTRMRes, pr_ctxt) !=
>  			DSP_ENOTFOUND)
> -		DRV_ProcUpdateSTRMRes(uNumBufs, hSTRMRes, pr_ctxt);
> +		DRV_ProcUpdateSTRMRes(uNumBufs, hSTRMRes);
>  #endif
>  func_end:
>  	return status;
> @@ -340,7 +340,7 @@ DSP_STATUS STRM_FreeBuffer(struct STRM_OBJECT *hStrm, u8 **apBuffer,
>  #ifndef RES_CLEANUP_DISABLE
>  	if (DRV_GetSTRMResElement(hStrm, hSTRMRes, pr_ctxt) !=
>  			DSP_ENOTFOUND)
> -		DRV_ProcUpdateSTRMRes(uNumBufs-i, hSTRMRes, pr_ctxt);
> +		DRV_ProcUpdateSTRMRes(uNumBufs-i, hSTRMRes);
>  #endif
>  	return status;
>  }

Acked-by: Ameya Palande <ameya.palande@nokia.com>


^ permalink raw reply	[flat|nested] 10+ messages in thread
* RE: [PATCH 0/6] DSPBRIDGE: fixes from current patch queue
  2010-01-19 20:54 [PATCH 0/6] DSPBRIDGE: fixes from current patch queue Omar Ramirez Luna
  2010-01-19 20:54 ` [PATCH 1/6] DSPBRIDGE: Rename DEBUG define to use menuconfig style Omar Ramirez Luna
@ 2010-01-20 22:53 ` Ramirez Luna, Omar
  1 sibling, 0 replies; 10+ messages in thread
From: Ramirez Luna, Omar @ 2010-01-20 22:53 UTC (permalink / raw)
  To: linux-omap; +Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Menon, Nishanth

>From: Ramirez Luna, Omar on Tuesday, January 19, 2010 2:54 PM
>
>Fixes and cleanups accumulated due to baseline sync.
>
>This set should be applied after "Return right error codes" patch set.
>
>Fernando Guzman Lugo (4):
>  DSPBRIDGE: remove NLDR_Free wrapper function
>  DSPBRIDGE: Optimize remove resource functions
>  DSPBRIDGE: remove wrong comment from RequestBridgeResources
>  DSPBRIDGE: Always print DSP traces
>
>Omar Ramirez Luna (2):
>  DSPBRIDGE: Rename DEBUG define to use menuconfig style
>  DSPBRIDGE: Remove unused variables from resource cleanup
>
> arch/arm/plat-omap/include/dspbridge/dbg.h         |    4 +-
> arch/arm/plat-omap/include/dspbridge/nldr.h        |    1 -
> arch/arm/plat-omap/include/dspbridge/nldrdefs.h    |    1 -
> .../plat-omap/include/dspbridge/resourcecleanup.h  |    3 +-
> drivers/dsp/bridge/Makefile                        |    2 +-
> drivers/dsp/bridge/gen/_gt_para.c                  |    2 +-
> drivers/dsp/bridge/gen/gt.c                        |    2 +-
> drivers/dsp/bridge/rmgr/drv.c                      |   98 ++++++++------------
> drivers/dsp/bridge/rmgr/drv_interface.c            |    4 +-
> drivers/dsp/bridge/rmgr/nldr.c                     |   19 +---
> drivers/dsp/bridge/rmgr/node.c                     |   13 +--
> drivers/dsp/bridge/rmgr/proc.c                     |   18 ++--
> drivers/dsp/bridge/rmgr/strm.c                     |    4 +-
> drivers/dsp/bridge/services/cfg.c                  |   14 ++--
> drivers/dsp/bridge/services/dbg.c                  |    4 +-
> drivers/dsp/bridge/services/mem.c                  |    2 +-
> drivers/dsp/bridge/wmd/io_sm.c                     |   10 +-
> 17 files changed, 82 insertions(+), 119 deletions(-)

Pushed to dspbridge

- omar

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2010-01-20 22:53 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-01-19 20:54 [PATCH 0/6] DSPBRIDGE: fixes from current patch queue Omar Ramirez Luna
2010-01-19 20:54 ` [PATCH 1/6] DSPBRIDGE: Rename DEBUG define to use menuconfig style Omar Ramirez Luna
2010-01-19 20:54   ` [PATCH 2/6] DSPBRIDGE: remove NLDR_Free wrapper function Omar Ramirez Luna
2010-01-19 20:54     ` [PATCH 3/6] DSPBRIDGE: Optimize remove resource functions Omar Ramirez Luna
2010-01-19 20:54       ` [PATCH 4/6] DSPBRIDGE: Remove unused variables from resource cleanup Omar Ramirez Luna
2010-01-19 20:54         ` [PATCH 5/6] DSPBRIDGE: remove wrong comment from RequestBridgeResources Omar Ramirez Luna
2010-01-19 20:54           ` [PATCH 6/6] DSPBRIDGE: Always print DSP traces Omar Ramirez Luna
2010-01-20 10:04           ` [PATCH 5/6] DSPBRIDGE: remove wrong comment from RequestBridgeResources Ameya Palande
2010-01-20 10:05         ` [PATCH 4/6] DSPBRIDGE: Remove unused variables from resource cleanup Ameya Palande
2010-01-20 22:53 ` [PATCH 0/6] DSPBRIDGE: fixes from current patch queue Ramirez Luna, Omar

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.