* [PATCH 00/12] Custom debug removal
@ 2010-02-18 21:37 Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 01/12] DSPBRIDGE: global bridge device Omar Ramirez Luna
2010-02-23 18:09 ` [PATCH 00/12] Custom debug removal Omar Ramirez Luna
0 siblings, 2 replies; 14+ messages in thread
From: Omar Ramirez Luna @ 2010-02-18 21:37 UTC (permalink / raw)
To: linux-omap
Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
Omar Ramirez Luna
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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 01/12] DSPBRIDGE: global bridge device
2010-02-18 21:37 [PATCH 00/12] Custom debug removal Omar Ramirez Luna
@ 2010-02-18 21:37 ` Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 02/12] DSPBRIDGE: Change custom GT_trace for dev_dbg Omar Ramirez Luna
2010-02-23 18:09 ` [PATCH 00/12] Custom debug removal Omar Ramirez Luna
1 sibling, 1 reply; 14+ messages in thread
From: Omar Ramirez Luna @ 2010-02-18 21:37 UTC (permalink / raw)
To: linux-omap
Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
Omar Ramirez Luna
This patch declares and externs a pointer to a bridge device
to be used with dev_dbg.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
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(-)
diff --git a/arch/arm/plat-omap/include/dspbridge/host_os.h b/arch/arm/plat-omap/include/dspbridge/host_os.h
index 066c4d7..8cc1c6f 100644
--- a/arch/arm/plat-omap/include/dspbridge/host_os.h
+++ b/arch/arm/plat-omap/include/dspbridge/host_os.h
@@ -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);
diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index cff2877..cadb670 100644
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -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) {
--
1.6.2.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 02/12] DSPBRIDGE: Change custom GT_trace for dev_dbg
2010-02-18 21:37 ` [PATCH 01/12] DSPBRIDGE: global bridge device Omar Ramirez Luna
@ 2010-02-18 21:37 ` Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 03/12] DSPBRIDGE: Change custom GT_trace for dev_dbg in wmd Omar Ramirez Luna
0 siblings, 1 reply; 14+ messages in thread
From: Omar Ramirez Luna @ 2010-02-18 21:37 UTC (permalink / raw)
To: linux-omap
Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
Omar Ramirez Luna
Remove GT_Trace custom debugging mechanism and use dev_dbg.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
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
diff --git a/drivers/dsp/bridge/rmgr/dbdcd.c b/drivers/dsp/bridge/rmgr/dbdcd.c
index 5e07abd..067f7a0 100644
--- a/drivers/dsp/bridge/rmgr/dbdcd.c
+++ b/drivers/dsp/bridge/rmgr/dbdcd.c
@@ -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);
diff --git a/drivers/dsp/bridge/rmgr/disp.c b/drivers/dsp/bridge/rmgr/disp.c
index 795856b..8c05593 100644
--- a/drivers/dsp/bridge/rmgr/disp.c
+++ b/drivers/dsp/bridge/rmgr/disp.c
@@ -304,9 +304,8 @@ DSP_STATUS DISP_NodeCreate(struct DISP_OBJECT *hDisp, struct NODE_OBJECT *hNode,
goto func_end;
if (devType != DSP_UNIT) {
- GT_1trace(DISP_DebugMask, GT_7CLASS,
- "DISP_NodeCreate unknown device "
- "type = 0x%x\n", devType);
+ dev_dbg(bridge, "%s: unknown device type = 0x%x\n",
+ __func__, devType);
goto func_end;
}
DBC_Require(pArgs != NULL);
@@ -323,10 +322,8 @@ DSP_STATUS DISP_NodeCreate(struct DISP_OBJECT *hDisp, struct NODE_OBJECT *hNode,
/ sizeof(RMS_WORD) - 1 + dwLength;
if (total >= max) {
status = DSP_EFAIL;
- GT_2trace(DISP_DebugMask, GT_6CLASS,
- "DISP_NodeCreate: Message args too"
- " large for buffer! Message args size = %d, max = %d\n",
- total, max);
+ dev_dbg(bridge, "%s: Message args too large for buffer! size "
+ "= %d, max = %d\n", __func__, total, max);
}
/*
* Fill in buffer to send to RMS.
@@ -423,10 +420,9 @@ DSP_STATUS DISP_NodeCreate(struct DISP_OBJECT *hDisp, struct NODE_OBJECT *hNode,
pMoreTaskArgs->numInputStreams = taskArgs.uNumInputs;
total +=
sizeof(struct RMS_MoreTaskArgs) / sizeof(RMS_WORD);
- GT_2trace(DISP_DebugMask, GT_7CLASS,
- "DISP::::uDSPHeapAddr %x, "
- "uHeapSize %x\n", taskArgs.uDSPHeapAddr,
- taskArgs.uHeapSize);
+ dev_dbg(bridge, "%s: uDSPHeapAddr %x, uHeapSize %x\n",
+ __func__, taskArgs.uDSPHeapAddr,
+ taskArgs.uHeapSize);
/* Keep track of pSIOInDef[] and pSIOOutDef[]
* positions in the buffer, since this needs to be
* filled in later. */
@@ -477,13 +473,9 @@ DSP_STATUS DISP_NodeCreate(struct DISP_OBJECT *hDisp, struct NODE_OBJECT *hNode,
* on the DSP-side
*/
status = (((RMS_WORD *)(hDisp->pBuf))[0]);
- if (DSP_FAILED(status)) {
- GT_1trace(DISP_DebugMask, GT_6CLASS,
- "DISP_NodeCreate, "
- "DSP-side Node Create failed: 0x%x\n",
- status);
- }
-
+ if (DSP_FAILED(status))
+ dev_dbg(bridge, "%s: DSP-side failed: 0x%x\n",
+ __func__, status);
}
}
func_end:
@@ -532,12 +524,9 @@ DSP_STATUS DISP_NodeDelete(struct DISP_OBJECT *hDisp, struct NODE_OBJECT *hNode,
* function on the DSP-side
*/
status = (((RMS_WORD *)(hDisp->pBuf))[0]);
- if (DSP_FAILED(status)) {
- GT_1trace(DISP_DebugMask, GT_6CLASS,
- "DISP_NodeDelete, "
- "DSP-side Node Delete failed: 0x%x\n",
- status);
- }
+ if (DSP_FAILED(status))
+ dev_dbg(bridge, "%s: DSP-side failed: "
+ "0x%x\n", __func__, status);
}
@@ -587,12 +576,9 @@ DSP_STATUS DISP_NodeRun(struct DISP_OBJECT *hDisp, struct NODE_OBJECT *hNode,
* function on the DSP-side
*/
status = (((RMS_WORD *)(hDisp->pBuf))[0]);
- if (DSP_FAILED(status)) {
- GT_1trace(DISP_DebugMask, GT_6CLASS,
- "DISP_NodeRun, DSP-side Node "
- "Execute failed: 0x%x\n",
- status);
- }
+ if (DSP_FAILED(status))
+ dev_dbg(bridge, "%s: DSP-side failed: "
+ "0x%x\n", __func__, status);
}
}
@@ -621,19 +607,15 @@ static void DeleteDisp(struct DISP_OBJECT *hDisp)
status = (*pIntfFxns->pfnChnlClose)
(hDisp->hChnlFromDsp);
if (DSP_FAILED(status)) {
- GT_1trace(DISP_DebugMask, GT_6CLASS,
- "DISP_Delete: Failed to "
- "close channel from RMS: 0x%x\n",
- status);
+ dev_dbg(bridge, "%s: Failed to close channel "
+ "from RMS: 0x%x\n", __func__, status);
}
}
if (hDisp->hChnlToDsp) {
status = (*pIntfFxns->pfnChnlClose)(hDisp->hChnlToDsp);
if (DSP_FAILED(status)) {
- GT_1trace(DISP_DebugMask, GT_6CLASS,
- "DISP_Delete: Failed to "
- "close channel to RMS: 0x%x\n",
- status);
+ dev_dbg(bridge, "%s: Failed to close channel to"
+ " RMS: 0x%x\n", __func__, status);
}
}
kfree(hDisp->pBuf);
diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c
index 44208b7..f3e2632 100644
--- a/drivers/dsp/bridge/rmgr/drv.c
+++ b/drivers/dsp/bridge/rmgr/drv.c
@@ -861,24 +861,23 @@ DSP_STATUS DRV_RequestResources(u32 dwContext, u32 *pDevNodeString)
*pDevNodeString = 0;
}
} else {
- GT_0trace(curTrace, GT_7CLASS,
- "Failed to get Driver Object from Registry");
+ dev_dbg(bridge, "%s: Failed to get Driver Object from Registry",
+ __func__);
*pDevNodeString = 0;
}
if (!(strcmp((char *) dwContext, "TIOMAP1510"))) {
- GT_0trace(curTrace, GT_1CLASS,
- " Allocating resources for UMA \n");
+ dev_dbg(bridge, "%s: Allocating resources for UMA\n", __func__);
status = RequestBridgeResourcesDSP(dwContext, DRV_ASSIGN);
} else {
status = DSP_EFAIL;
- GT_0trace(curTrace, GT_7CLASS, "Unknown Device ");
+ dev_dbg(bridge, "%s: Unknown Device\n", __func__);
}
- if (DSP_FAILED(status)) {
- GT_0trace(curTrace, GT_7CLASS,
- "Failed to reserve bridge resources ");
- }
+ if (DSP_FAILED(status))
+ dev_dbg(bridge, "%s: Failed to reserve bridge resources\n",
+ __func__);
+
DBC_Ensure((DSP_SUCCEEDED(status) && pDevNodeString != NULL &&
!LST_IsEmpty(pDRVObject->devNodeString)) ||
(DSP_FAILED(status) && *pDevNodeString == 0));
@@ -901,11 +900,11 @@ DSP_STATUS DRV_ReleaseResources(u32 dwContext, struct DRV_OBJECT *hDrvObject)
"TIOMAP1510")))
status = RequestBridgeResources(dwContext, DRV_RELEASE);
else
- GT_0trace(curTrace, GT_1CLASS, " Unknown device\n");
+ dev_dbg(bridge, "%s: Unknown device\n", __func__);
if (DSP_FAILED(status))
- GT_0trace(curTrace, GT_1CLASS,
- "Failed to relese bridge resources\n");
+ dev_dbg(bridge, "%s: Failed to relese bridge resources\n",
+ __func__);
/*
* Irrespective of the status go ahead and clean it
@@ -973,10 +972,9 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest)
shm_size);
}
} else {
- GT_1trace(curTrace, GT_7CLASS,
- "Error getting SHM size from registry: "
- "%x. Not calling MEM_FreePhysMem\n",
- status);
+ dev_dbg(bridge, "%s: Error getting SHM size "
+ "from registry: %x. Not calling "
+ "MEM_FreePhysMem\n", __func__, status);
}
pResources->dwMemBase[1] = 0;
pResources->dwMemPhys[1] = 0;
@@ -1044,20 +1042,16 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest)
OMAP_MBOX_SIZE);
pResources->dwSysCtrlBase = ioremap(OMAP_SYSC_BASE,
OMAP_SYSC_SIZE);
- GT_1trace(curTrace, GT_2CLASS, "dwMemBase[0] 0x%x\n",
- pResources->dwMemBase[0]);
- GT_1trace(curTrace, GT_2CLASS, "dwMemBase[3] 0x%x\n",
- pResources->dwMemBase[3]);
- GT_1trace(curTrace, GT_2CLASS, "dwPrmBase 0x%x\n",
- pResources->dwPrmBase);
- GT_1trace(curTrace, GT_2CLASS, "dwCmBase 0x%x\n",
- pResources->dwCmBase);
- GT_1trace(curTrace, GT_2CLASS, "dwWdTimerDspBase 0x%x\n",
+ dev_dbg(bridge, "dwMemBase[0] 0x%x\n",
+ pResources->dwMemBase[0]);
+ dev_dbg(bridge, "dwMemBase[3] 0x%x\n",
+ pResources->dwMemBase[3]);
+ dev_dbg(bridge, "dwPrmBase %p\n", pResources->dwPrmBase);
+ dev_dbg(bridge, "dwCmBase %p\n", pResources->dwCmBase);
+ dev_dbg(bridge, "dwWdTimerDspBase %p\n",
pResources->dwWdTimerDspBase);
- GT_1trace(curTrace, GT_2CLASS, "dwMboxBase 0x%x\n",
- pResources->dwMboxBase);
- GT_1trace(curTrace, GT_2CLASS, "dwDmmuBase 0x%x\n",
- pResources->dwDmmuBase);
+ dev_dbg(bridge, "dwMboxBase %p\n", pResources->dwMboxBase);
+ dev_dbg(bridge, "dwDmmuBase %p\n", pResources->dwDmmuBase);
/* for 24xx base port is not mapping the mamory for DSP
* internal memory TODO Do a ioremap here */
@@ -1075,9 +1069,8 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest)
status = REG_SetValue(CURRENTCONFIG, (u8 *)pResources,
sizeof(struct CFG_HOSTRES));
if (DSP_FAILED(status)) {
- GT_0trace(curTrace, GT_7CLASS,
- " Failed to set the registry "
- "value for CURRENTCONFIG\n");
+ dev_dbg(bridge, "%s: Failed to set the registry value "
+ "for CURRENTCONFIG\n", __func__);
}
kfree(pResources);
}
@@ -1135,26 +1128,22 @@ static DSP_STATUS RequestBridgeResourcesDSP(u32 dwContext, s32 bRequest)
OMAP_DMMU_SIZE);
pResources->dwWdTimerDspBase = NULL;
- GT_1trace(curTrace, GT_2CLASS, "dwMemBase[0] 0x%x\n",
+ dev_dbg(bridge, "dwMemBase[0] 0x%x\n",
pResources->dwMemBase[0]);
- GT_1trace(curTrace, GT_2CLASS, "dwMemBase[1] 0x%x\n",
+ dev_dbg(bridge, "dwMemBase[1] 0x%x\n",
pResources->dwMemBase[1]);
- GT_1trace(curTrace, GT_2CLASS, "dwMemBase[2] 0x%x\n",
+ dev_dbg(bridge, "dwMemBase[2] 0x%x\n",
pResources->dwMemBase[2]);
- GT_1trace(curTrace, GT_2CLASS, "dwMemBase[3] 0x%x\n",
+ dev_dbg(bridge, "dwMemBase[3] 0x%x\n",
pResources->dwMemBase[3]);
- GT_1trace(curTrace, GT_2CLASS, "dwMemBase[4] 0x%x\n",
+ dev_dbg(bridge, "dwMemBase[4] 0x%x\n",
pResources->dwMemBase[4]);
- GT_1trace(curTrace, GT_2CLASS, "dwPrmBase 0x%x\n",
- pResources->dwPrmBase);
- GT_1trace(curTrace, GT_2CLASS, "dwCmBase 0x%x\n",
- pResources->dwCmBase);
- GT_1trace(curTrace, GT_2CLASS, "dwWdTimerDspBase 0x%x\n",
+ dev_dbg(bridge, "dwPrmBase %p\n", pResources->dwPrmBase);
+ dev_dbg(bridge, "dwCmBase %p\n", pResources->dwCmBase);
+ dev_dbg(bridge, "dwWdTimerDspBase %p\n",
pResources->dwWdTimerDspBase);
- GT_1trace(curTrace, GT_2CLASS, "dwMboxBase 0x%x\n",
- pResources->dwMboxBase);
- GT_1trace(curTrace, GT_2CLASS, "dwDmmuBase 0x%x\n",
- pResources->dwDmmuBase);
+ dev_dbg(bridge, "dwMboxBase %p\n", pResources->dwMboxBase);
+ dev_dbg(bridge, "dwDmmuBase %p\n", pResources->dwDmmuBase);
dwBuffSize = sizeof(shm_size);
status = REG_GetValue(SHMSIZE, (u8 *)&shm_size, &dwBuffSize);
if (DSP_SUCCEEDED(status)) {
@@ -1170,9 +1159,8 @@ static DSP_STATUS RequestBridgeResourcesDSP(u32 dwContext, s32 bRequest)
pResources->dwMemLength[1] = shm_size;
pResources->dwMemPhys[1] = dmaAddr;
- GT_3trace(curTrace, GT_1CLASS,
- "Bridge SHM address 0x%x dmaAddr"
- " %x size %x\n",
+ dev_dbg(bridge, "%s: Bridge SHM address 0x%x "
+ "dmaAddr %x size %x\n", __func__,
pResources->dwMemBase[1],
dmaAddr, shm_size);
}
@@ -1190,9 +1178,8 @@ static DSP_STATUS RequestBridgeResourcesDSP(u32 dwContext, s32 bRequest)
status = REG_SetValue(CURRENTCONFIG, (u8 *)pResources,
sizeof(struct CFG_HOSTRES));
if (DSP_FAILED(status)) {
- GT_0trace(curTrace, GT_7CLASS,
- " Failed to set the registry value"
- " for CURRENTCONFIG\n");
+ dev_dbg(bridge, "%s: Failed to set the registry"
+ " value for CURRENTCONFIG\n", __func__);
}
}
kfree(pResources);
diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index cadb670..4045784 100644
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -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);
diff --git a/drivers/dsp/bridge/rmgr/dspdrv.c b/drivers/dsp/bridge/rmgr/dspdrv.c
index b6a9bc4..59c2ecb 100644
--- a/drivers/dsp/bridge/rmgr/dspdrv.c
+++ b/drivers/dsp/bridge/rmgr/dspdrv.c
@@ -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));
diff --git a/drivers/dsp/bridge/rmgr/mgr.c b/drivers/dsp/bridge/rmgr/mgr.c
index b905906..73d7a66 100644
--- a/drivers/dsp/bridge/rmgr/mgr.c
+++ b/drivers/dsp/bridge/rmgr/mgr.c
@@ -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:
diff --git a/drivers/dsp/bridge/rmgr/nldr.c b/drivers/dsp/bridge/rmgr/nldr.c
index e964d4b..fb5a788 100644
--- a/drivers/dsp/bridge/rmgr/nldr.c
+++ b/drivers/dsp/bridge/rmgr/nldr.c
@@ -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)
diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c
index 1c8b4a5..48a7728 100644
--- a/drivers/dsp/bridge/rmgr/node.c
+++ b/drivers/dsp/bridge/rmgr/node.c
@@ -341,11 +341,6 @@ DSP_STATUS NODE_Allocate(struct PROC_OBJECT *hProcessor,
DBC_Require(phNode != NULL);
DBC_Require(pNodeId != NULL);
- GT_5trace(NODE_debugMask, GT_ENTER, "NODE_Allocate: \thProcessor: "
- "0x%x\tpNodeId: 0x%x\tpArgs: 0x%x\tpAttrIn: "
- "0x%x\tphNode: 0x%x\n", hProcessor, pNodeId, pArgs, pAttrIn,
- phNode);
-
*phNode = NULL;
status = PROC_GetProcessorId(hProcessor, &procId);
@@ -610,10 +605,9 @@ func_cont:
ulStackSegVal = (u32)*((REG_UWORD32 *)
((u32)(ulStackSegAddr)));
- GT_1trace(NODE_debugMask, GT_5CLASS,
- "StackSegVal =0x%x\n", ulStackSegVal);
- GT_1trace(NODE_debugMask, GT_5CLASS,
- "ulStackSegAddr = 0x%x\n", ulStackSegAddr);
+ dev_dbg(bridge, "%s: StackSegVal = 0x%x, StackSegAddr ="
+ " 0x%x\n", __func__, ulStackSegVal,
+ ulStackSegAddr);
pNode->createArgs.asa.taskArgs.uStackSeg =
ulStackSegVal;
@@ -665,6 +659,9 @@ func_cont:
(DSP_SUCCEEDED(status)
&& MEM_IsValidHandle((*phNode), NODE_SIGNATURE)));
func_end:
+ dev_dbg(bridge, "%s: hProcessor: %p pNodeId: %p pArgs: %p pAttrIn: %p "
+ "phNode: %p status: 0x%x\n", __func__, hProcessor,
+ pNodeId, pArgs, pAttrIn, phNode, status);
return status;
}
@@ -841,10 +838,6 @@ DSP_STATUS NODE_Connect(struct NODE_OBJECT *hNode1, u32 uStream1,
u32 dwLength;
DSP_STATUS status = DSP_SOK;
DBC_Require(cRefs > 0);
- GT_5trace(NODE_debugMask, GT_ENTER,
- "NODE_Connect: hNode1: 0x%x\tuStream1:"
- " %d\thNode2: 0x%x\tuStream2: %d\tpAttrs: 0x%x\n", hNode1,
- uStream1, hNode2, uStream2, pAttrs);
if ((hNode1 != (struct NODE_OBJECT *) DSP_HGPPNODE &&
!MEM_IsValidHandle(hNode1, NODE_SIGNATURE)) ||
@@ -1116,6 +1109,9 @@ func_cont:
/* Exit critical section */
(void)SYNC_LeaveCS(hNodeMgr->hSync);
func_end:
+ dev_dbg(bridge, "%s: hNode1: %p uStream1: %d hNode2: %p uStream2: %d"
+ "pAttrs: %p status: 0x%x\n", __func__, hNode1,
+ uStream1, hNode2, uStream2, pAttrs, status);
return status;
}
@@ -1143,8 +1139,6 @@ DSP_STATUS NODE_Create(struct NODE_OBJECT *hNode)
#endif
DBC_Require(cRefs > 0);
- GT_1trace(NODE_debugMask, GT_ENTER, "NODE_Create: hNode: 0x%x\n",
- hNode);
if (!MEM_IsValidHandle(pNode, NODE_SIGNATURE)) {
status = DSP_EHANDLE;
goto func_end;
@@ -1273,6 +1267,8 @@ func_end:
NTFY_Notify(hNode->hNtfy, DSP_NODESTATECHANGE);
}
+ dev_dbg(bridge, "%s: hNode: %p status: 0x%x\n", __func__,
+ hNode, status);
return status;
}
@@ -1423,8 +1419,7 @@ DSP_STATUS NODE_Delete(struct NODE_OBJECT *hNode,
struct DSP_PROCESSORSTATE procStatus;
DBC_Require(cRefs > 0);
- GT_1trace(NODE_debugMask, GT_ENTER, "NODE_Delete: hNode: 0x%x\n",
- hNode);
+
if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE)) {
status = DSP_EHANDLE;
goto func_end;
@@ -1542,6 +1537,7 @@ func_cont1:
(void)SYNC_LeaveCS(hNodeMgr->hSync);
PROC_NotifyClients(hProcessor, DSP_NODESTATECHANGE);
func_end:
+ dev_dbg(bridge, "%s: hNode: %p status 0x%x\n", __func__, hNode, status);
return status;
}
@@ -1775,9 +1771,7 @@ DSP_STATUS NODE_GetMessage(struct NODE_OBJECT *hNode, OUT struct DSP_MSG *pMsg,
DBC_Require(cRefs > 0);
DBC_Require(pMsg != NULL);
- GT_3trace(NODE_debugMask, GT_ENTER,
- "NODE_GetMessage: hNode: 0x%x\tpMsg: "
- "0x%x\tuTimeout: 0x%x\n", hNode, pMsg, uTimeout);
+
if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE)) {
status = DSP_EHANDLE;
goto func_end;
@@ -1830,6 +1824,8 @@ DSP_STATUS NODE_GetMessage(struct NODE_OBJECT *hNode, OUT struct DSP_MSG *pMsg,
status = DSP_ETRANSLATE;
}
func_end:
+ dev_dbg(bridge, "%s: hNode: %p pMsg: %p uTimeout: 0x%x\n", __func__,
+ hNode, pMsg, uTimeout);
return status;
}
@@ -1881,9 +1877,7 @@ enum NLDR_LOADTYPE NODE_GetLoadType(struct NODE_OBJECT *hNode)
DBC_Require(cRefs > 0);
DBC_Require(MEM_IsValidHandle(hNode, NODE_SIGNATURE));
if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE)) {
- GT_1trace(NODE_debugMask, GT_5CLASS,
- "NODE_GetLoadType: Failed. hNode:"
- " 0x%x\n", hNode);
+ dev_dbg(bridge, "%s: Failed. hNode: %p\n", __func__, hNode);
return -1;
} else {
return hNode->dcdProps.objData.nodeObj.usLoadType;
@@ -1900,9 +1894,7 @@ u32 NODE_GetTimeout(struct NODE_OBJECT *hNode)
DBC_Require(cRefs > 0);
DBC_Require(MEM_IsValidHandle(hNode, NODE_SIGNATURE));
if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE)) {
- GT_1trace(NODE_debugMask, GT_5CLASS,
- "NODE_GetTimeout: Failed. hNode:"
- " 0x%x\n", hNode);
+ dev_dbg(bridge, "%s: failed. hNode: %p\n", __func__, hNode);
return 0;
} else {
return hNode->uTimeout;
@@ -1991,8 +1983,6 @@ DSP_STATUS NODE_Pause(struct NODE_OBJECT *hNode)
DBC_Require(cRefs > 0);
- GT_1trace(NODE_debugMask, GT_ENTER, "NODE_Pause: hNode: 0x%x\n", hNode);
-
if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE)) {
status = DSP_EHANDLE;
} else {
@@ -2055,6 +2045,7 @@ func_cont:
}
}
func_end:
+ dev_dbg(bridge, "%s: hNode: %p status 0x%x\n", __func__, hNode, status);
return status;
}
@@ -2080,9 +2071,7 @@ DSP_STATUS NODE_PutMessage(struct NODE_OBJECT *hNode,
DBC_Require(cRefs > 0);
DBC_Require(pMsg != NULL);
- GT_3trace(NODE_debugMask, GT_ENTER,
- "NODE_PutMessage: hNode: 0x%x\tpMsg: "
- "0x%x\tuTimeout: 0x%x\n", hNode, pMsg, uTimeout);
+
if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE)) {
status = DSP_EHANDLE;
goto func_end;
@@ -2154,6 +2143,8 @@ DSP_STATUS NODE_PutMessage(struct NODE_OBJECT *hNode,
&newMsg, uTimeout);
}
func_end:
+ dev_dbg(bridge, "%s: hNode: %p pMsg: %p uTimeout: 0x%x, "
+ "status 0x%x\n", __func__, hNode, pMsg, uTimeout, status);
return status;
}
@@ -2172,11 +2163,6 @@ DSP_STATUS NODE_RegisterNotify(struct NODE_OBJECT *hNode, u32 uEventMask,
DBC_Require(cRefs > 0);
DBC_Require(hNotification != NULL);
- GT_4trace(NODE_debugMask, GT_ENTER,
- "NODE_RegisterNotify: hNode: 0x%x\t"
- "uEventMask: 0x%x\tuNotifyType: 0x%x\thNotification: 0x%x\n",
- hNode, uEventMask, uNotifyType, hNotification);
-
if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE)) {
status = DSP_EHANDLE;
} else {
@@ -2209,6 +2195,9 @@ DSP_STATUS NODE_RegisterNotify(struct NODE_OBJECT *hNode, u32 uEventMask,
}
}
+ dev_dbg(bridge, "%s: hNode: %p uEventMask: 0x%x uNotifyType: 0x%x "
+ "hNotification: %p status 0x%x\n", __func__, hNode,
+ uEventMask, uNotifyType, hNotification, status);
return status;
}
@@ -2234,7 +2223,7 @@ DSP_STATUS NODE_Run(struct NODE_OBJECT *hNode)
struct PROC_OBJECT *hProcessor;
DBC_Require(cRefs > 0);
- GT_1trace(NODE_debugMask, GT_ENTER, "NODE_Run: hNode: 0x%x\n", hNode);
+
if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE)) {
status = DSP_EHANDLE;
goto func_end;
@@ -2330,6 +2319,7 @@ func_cont:
NTFY_Notify(hNode->hNtfy, DSP_NODESTATECHANGE);
}
func_end:
+ dev_dbg(bridge, "%s: hNode: %p status 0x%x\n", __func__, hNode, status);
return status;
}
@@ -2355,8 +2345,6 @@ DSP_STATUS NODE_Terminate(struct NODE_OBJECT *hNode, OUT DSP_STATUS *pStatus)
DBC_Require(cRefs > 0);
DBC_Require(pStatus != NULL);
- GT_1trace(NODE_debugMask, GT_ENTER,
- "NODE_Terminate: hNode: 0x%x\n", hNode);
if (!MEM_IsValidHandle(hNode, NODE_SIGNATURE) || !hNode->hNodeMgr) {
status = DSP_EHANDLE;
goto func_end;
@@ -2470,9 +2458,8 @@ func_cont:
status = DSP_EFAIL;
} else {
*pStatus = hNode->nExitStatus;
- GT_1trace(NODE_debugMask, GT_ENTER,
- "NODE_Terminate: env = 0x%x "
- "succeeded.\n", hNode->nodeEnv);
+ dev_dbg(bridge, "%s: hNode: %p env 0x%x status 0x%x\n",
+ __func__, hNode, hNode->nodeEnv, status);
}
(void)SYNC_LeaveCS(hNodeMgr->hSync);
} /*End of SYNC_EnterCS */
@@ -2891,7 +2878,7 @@ static DSP_STATUS GetNodeProps(struct DCD_MANAGER *hDcdMgr,
/* Create UUID value to set in registry. */
UUID_UuidToString((struct DSP_UUID *)pNodeId, szUuid,
MAXUUIDLEN);
- DBG_Trace(DBG_LEVEL7, "\n** (node) UUID: %s\n", szUuid);
+ dev_dbg(bridge, "(node) UUID: %s\n", szUuid);
#endif
/* Fill in message args that come from NDB */
@@ -2902,8 +2889,7 @@ static DSP_STATUS GetNodeProps(struct DCD_MANAGER *hDcdMgr,
uMsgNotifyType;
pMsgArgs->uMaxMessages = pndbProps->uMessageDepth;
#ifdef CONFIG_BRIDGE_DEBUG
- DBG_Trace(DBG_LEVEL7,
- "** (node) Max Number of Messages: 0x%x\n",
+ dev_dbg(bridge, "(node) Max Number of Messages: 0x%x\n",
pMsgArgs->uMaxMessages);
#endif
} else {
@@ -2929,12 +2915,9 @@ static DSP_STATUS GetNodeProps(struct DCD_MANAGER *hDcdMgr,
pTaskArgs->uSysStackSize = pndbProps->uSysStackSize;
pTaskArgs->uStackSeg = pndbProps->uStackSeg;
#ifdef CONFIG_BRIDGE_DEBUG
- DBG_Trace(DBG_LEVEL7,
- "** (node) Priority: 0x%x\n" "** (node) Stack"
- " Size: 0x%x words\n" "** (node) System Stack"
- " Size: 0x%x words\n" "** (node) Stack"
- " Segment: 0x%x\n\n",
- "** (node) profile count : 0x%x \n \n",
+ 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",
pTaskArgs->nPriority, pTaskArgs->uStackSize,
pTaskArgs->uSysStackSize,
pTaskArgs->uStackSeg,
@@ -3096,14 +3079,12 @@ static DSP_STATUS GetRMSFxns(struct NODE_MGR *hNodeMgr)
* May be loaded dynamically (in the future),
* but return an error for now.
*/
- GT_1trace(NODE_debugMask, GT_6CLASS,
- "RMS function: %s "
- "currently not loaded\n", pszFxns[i]);
+ dev_dbg(bridge, "%s: RMS function: %s currently"
+ " not loaded\n", __func__, pszFxns[i]);
} else {
- GT_2trace(NODE_debugMask, GT_6CLASS,
- "GetRMSFxns: Symbol not "
- "found: %s\tstatus = 0x%x\n",
- pszFxns[i], status);
+ dev_dbg(bridge, "%s: Symbol not found: %s "
+ "status = 0x%x\n", __func__,
+ pszFxns[i], status);
break;
}
}
diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
index f372059..d8137c8 100644
--- a/drivers/dsp/bridge/rmgr/proc.c
+++ b/drivers/dsp/bridge/rmgr/proc.c
@@ -750,10 +750,8 @@ DSP_STATUS PROC_GetState(DSP_HPROCESSOR hProcessor,
} else {
status = DSP_EHANDLE;
}
- GT_2trace(PROC_DebugMask, GT_ENTER,
- "Exiting PROC_GetState, results:\n\t"
- "status: 0x%x\n\tpProcStatus: 0x%x\n", status,
- pProcStatus->iState);
+ dev_dbg(bridge, "%s, results: status: 0x%x pProcStatus: 0x%x\n",
+ __func__, status, pProcStatus->iState);
return status;
}
@@ -877,8 +875,8 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc,
status = snprintf(szProcID, MAXPROCIDLEN, PROC_ENVPROCID,
nProcID);
if (status == -1) {
- GT_0trace(PROC_DebugMask, GT_7CLASS, "PROC_Load: "
- "Proc ID string overflow \n");
+ dev_dbg(bridge, "%s: Proc ID string overflow\n",
+ __func__);
status = DSP_EFAIL;
} else {
newEnvp = PrependEnvp(newEnvp, (char **)aEnvp, cEnvp,
@@ -973,8 +971,8 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc,
pProcObject->hDevObject, NULL);
if (DSP_FAILED(status)) {
if (status == COD_E_OPENFAILED) {
- GT_0trace(PROC_DebugMask, GT_7CLASS,
- "PROC_Load:Failure to Load the EXE\n");
+ dev_dbg(bridge, "%s: Failure to Load the EXE\n",
+ __func__);
}
if (status == COD_E_SYMBOLNOTFOUND) {
pr_err("%s: Couldn't parse the file\n",
@@ -1048,8 +1046,7 @@ func_end:
tv2.tv_usec += 1000000;
tv2.tv_sec--;
}
- GT_2trace(PROC_DebugMask, GT_1CLASS,
- "Proc_Load: time to load %d sec and %d usec \n",
+ dev_dbg(bridge, "%s: time to load %d sec and %d usec\n", __func__,
tv2.tv_sec - tv1.tv_sec, tv2.tv_usec - tv1.tv_usec);
#endif
return status;
@@ -1073,19 +1070,12 @@ DSP_STATUS PROC_Map(DSP_HPROCESSOR hProcessor, void *pMpuAddr, u32 ulSize,
HANDLE dmmRes;
- GT_6trace(PROC_DebugMask, GT_ENTER, "Entered PROC_Map, args:\n\t"
- "hProcessor %x, pMpuAddr %x, ulSize %x, pReqAddr %x, "
- "ulMapAttr %x, ppMapAddr %x\n", hProcessor, pMpuAddr, ulSize,
- pReqAddr, ulMapAttr, ppMapAddr);
/* Calculate the page-aligned PA, VA and size */
vaAlign = PG_ALIGN_LOW((u32) pReqAddr, PG_SIZE_4K);
paAlign = PG_ALIGN_LOW((u32) pMpuAddr, PG_SIZE_4K);
sizeAlign = PG_ALIGN_HIGH(ulSize + (u32)pMpuAddr - paAlign,
PG_SIZE_4K);
- GT_3trace(PROC_DebugMask, GT_ENTER, "PROC_Map: vaAlign %x, paAlign %x, "
- "sizeAlign %x\n", vaAlign, paAlign, sizeAlign);
-
if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) {
status = DSP_EHANDLE;
goto func_end;
@@ -1118,7 +1108,12 @@ DSP_STATUS PROC_Map(DSP_HPROCESSOR hProcessor, void *pMpuAddr, u32 ulSize,
(u32)pReqAddr, (u32)*ppMapAddr, hProcessor);
}
func_end:
- GT_1trace(PROC_DebugMask, GT_ENTER, "Leaving PROC_Map [0x%x]", status);
+ dev_dbg(bridge, "%s: hProcessor %p, pMpuAddr %p, ulSize %x, "
+ "pReqAddr %p, ulMapAttr %x, ppMapAddr %p, vaAlign %x, "
+ "paAlign %x, sizeAlign %x status 0x%x\n", __func__, hProcessor,
+ pMpuAddr, ulSize, pReqAddr, ulMapAttr, ppMapAddr, vaAlign,
+ paAlign, sizeAlign, status);
+
return status;
}
@@ -1206,10 +1201,6 @@ DSP_STATUS PROC_ReserveMemory(DSP_HPROCESSOR hProcessor, u32 ulSize,
DSP_STATUS status = DSP_SOK;
struct PROC_OBJECT *pProcObject = (struct PROC_OBJECT *)hProcessor;
- GT_3trace(PROC_DebugMask, GT_ENTER,
- "Entered PROC_ReserveMemory, args:\n\t"
- "hProcessor: 0x%x ulSize: 0x%x ppRsvAddr: 0x%x\n", hProcessor,
- ulSize, ppRsvAddr);
if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) {
status = DSP_EHANDLE;
goto func_end;
@@ -1218,9 +1209,10 @@ DSP_STATUS PROC_ReserveMemory(DSP_HPROCESSOR hProcessor, u32 ulSize,
if (DSP_SUCCEEDED(status))
status = DMM_ReserveMemory(hDmmMgr, ulSize, (u32 *)ppRsvAddr);
- GT_1trace(PROC_DebugMask, GT_ENTER, "Leaving PROC_ReserveMemory [0x%x]",
- status);
func_end:
+ dev_dbg(bridge, "%s: hProcessor: 0x%p ulSize: 0x%x ppRsvAddr: 0x%p "
+ "status 0x%x\n", __func__, hProcessor,
+ ulSize, ppRsvAddr, status);
return status;
}
@@ -1341,9 +1333,7 @@ DSP_STATUS PROC_Stop(DSP_HPROCESSOR hProcessor)
status = (*pProcObject->pIntfFxns->pfnBrdStop)(pProcObject->
hWmdContext);
if (DSP_SUCCEEDED(status)) {
- GT_0trace(PROC_DebugMask, GT_1CLASS,
- "PROC_Stop: Processor Stopped, "
- "i.e in standby mode \n");
+ dev_dbg(bridge, "%s: processor in standby mode\n", __func__);
pProcObject->sState = PROC_STOPPED;
/* Destory the Node Manager, MSG Manager */
if (DSP_SUCCEEDED(DEV_Destroy2(pProcObject->hDevObject))) {
@@ -1384,10 +1374,6 @@ DSP_STATUS PROC_UnMap(DSP_HPROCESSOR hProcessor, void *pMapAddr,
HANDLE dmmRes;
- GT_2trace(PROC_DebugMask, GT_ENTER,
- "Entered PROC_UnMap, args:\n\thProcessor:"
- "0x%x pMapAddr: 0x%x\n", hProcessor, pMapAddr);
-
vaAlign = PG_ALIGN_LOW((u32) pMapAddr, PG_SIZE_4K);
if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) {
status = DSP_EHANDLE;
@@ -1418,8 +1404,8 @@ DSP_STATUS PROC_UnMap(DSP_HPROCESSOR hProcessor, void *pMapAddr,
!= DSP_ENOTFOUND)
DRV_RemoveDMMResElement(dmmRes, pr_ctxt);
func_end:
- GT_1trace(PROC_DebugMask, GT_ENTER,
- "Leaving PROC_UnMap [0x%x]", status);
+ dev_dbg(bridge, "%s: hProcessor: 0x%p pMapAddr: 0x%p status: 0x%x\n",
+ __func__, hProcessor, pMapAddr, status);
return status;
}
@@ -1434,9 +1420,6 @@ DSP_STATUS PROC_UnReserveMemory(DSP_HPROCESSOR hProcessor, void *pRsvAddr)
DSP_STATUS status = DSP_SOK;
struct PROC_OBJECT *pProcObject = (struct PROC_OBJECT *)hProcessor;
- GT_2trace(PROC_DebugMask, GT_ENTER,
- "Entered PROC_UnReserveMemory, args:\n\t"
- "hProcessor: 0x%x pRsvAddr: 0x%x\n", hProcessor, pRsvAddr);
if (!MEM_IsValidHandle(pProcObject, PROC_SIGNATURE)) {
status = DSP_EHANDLE;
goto func_end;
@@ -1445,10 +1428,9 @@ DSP_STATUS PROC_UnReserveMemory(DSP_HPROCESSOR hProcessor, void *pRsvAddr)
if (DSP_SUCCEEDED(status))
status = DMM_UnReserveMemory(hDmmMgr, (u32) pRsvAddr);
- GT_1trace(PROC_DebugMask, GT_ENTER,
- "Leaving PROC_UnReserveMemory [0x%x]",
- status);
func_end:
+ dev_dbg(bridge, "%s: hProcessor: 0x%p pRsvAddr: 0x%p status: 0x%x\n",
+ __func__, hProcessor, pRsvAddr, status);
return status;
}
diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c
index 52b796f..909a2b1 100644
--- a/drivers/dsp/bridge/rmgr/strm.c
+++ b/drivers/dsp/bridge/rmgr/strm.c
@@ -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;
}
diff --git a/drivers/dsp/bridge/uTimeout b/drivers/dsp/bridge/uTimeout
new file mode 100644
index 0000000..e69de29
--
1.6.2.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 03/12] DSPBRIDGE: Change custom GT_trace for dev_dbg in wmd
2010-02-18 21:37 ` [PATCH 02/12] DSPBRIDGE: Change custom GT_trace for dev_dbg Omar Ramirez Luna
@ 2010-02-18 21:37 ` Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 04/12] DSPBRIDGE: Change custom GT_trace for dev_dbg in pmgr Omar Ramirez Luna
0 siblings, 1 reply; 14+ messages in thread
From: Omar Ramirez Luna @ 2010-02-18 21:37 UTC (permalink / raw)
To: linux-omap
Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
Omar Ramirez Luna
Remove GT_Trace custom debugging mechanism and use dev_dbg.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
drivers/dsp/bridge/wmd/chnl_sm.c | 4 +-
drivers/dsp/bridge/wmd/io_sm.c | 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(-)
diff --git a/drivers/dsp/bridge/wmd/chnl_sm.c b/drivers/dsp/bridge/wmd/chnl_sm.c
index 5020e37..e681303 100644
--- a/drivers/dsp/bridge/wmd/chnl_sm.c
+++ b/drivers/dsp/bridge/wmd/chnl_sm.c
@@ -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)
diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c
index e9de3fc..00262db 100644
--- a/drivers/dsp/bridge/wmd/io_sm.c
+++ b/drivers/dsp/bridge/wmd/io_sm.c
@@ -221,8 +221,8 @@ DSP_STATUS WMD_IO_Create(OUT struct IO_MGR **phIOMgr,
bridge_workqueue = create_workqueue("bridge_work-queue");
if (bridge_workqueue <= 0)
- DBG_Trace(DBG_LEVEL1, "Workque Create failed 0x%d \n",
- bridge_workqueue);
+ dev_dbg(bridge, "%s: Workque Create failed %p\n", __func__,
+ bridge_workqueue);
/* Allocate IO manager object */
MEM_AllocObject(pIOMgr, struct IO_MGR, IO_MGRSIGNATURE);
@@ -411,9 +411,8 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr)
/* Get total length in bytes */
ulShmLength = (ulShmLimit - ulShmBase + 1) * hIOMgr->uWordSize;
/* Calculate size of a PROCCOPY shared memory region */
- DBG_Trace(DBG_LEVEL7,
- "**(proc)PROCCOPY SHMMEM SIZE: 0x%x bytes\n",
- (ulShmLength - sizeof(struct SHM)));
+ dev_dbg(bridge, "%s: (proc)proccopy shmmem size: 0x%x bytes\n",
+ __func__, (ulShmLength - sizeof(struct SHM)));
if (DSP_SUCCEEDED(status)) {
/* Get start and length of message part of shared memory */
@@ -489,11 +488,11 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr)
if (ulPadSize == ulPageAlignSize)
ulPadSize = 0x0;
- DBG_Trace(DBG_LEVEL7, "ulGppPa %x, ulGppVa %x, ulDspVa %x, "
- "ulShm0End %x, ulDynExtBase %x, ulExtEnd %x, "
- "ulSegSize %x ulSeg1Size %x \n", ulGppPa, ulGppVa,
- ulDspVa, ulShm0End, ulDynExtBase, ulExtEnd, ulSegSize,
- ulSeg1Size);
+ dev_dbg(bridge, "%s: ulGppPa %x, ulGppVa %x, ulDspVa %x, "
+ "ulShm0End %x, ulDynExtBase %x, ulExtEnd %x, "
+ "ulSegSize %x ulSeg1Size %x \n", __func__,
+ ulGppPa, ulGppVa, ulDspVa, ulShm0End,
+ ulDynExtBase, ulExtEnd, ulSegSize, ulSeg1Size);
if ((ulSegSize + ulSeg1Size + ulPadSize) >
hostRes.dwMemLength[1]) {
@@ -529,7 +528,7 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr)
* aligned.
*/
allBits = paCurr | vaCurr;
- DBG_Trace(DBG_LEVEL1, "allBits %x, paCurr %x, vaCurr %x, "
+ dev_dbg(bridge, "allBits %x, paCurr %x, vaCurr %x, "
"numBytes %x\n", allBits, paCurr, vaCurr, numBytes);
for (i = 0; i < 4; i++) {
if ((numBytes >= pgSize[i]) && ((allBits &
@@ -565,7 +564,7 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr)
* aligned.
*/
allBits = paCurr | vaCurr;
- DBG_Trace(DBG_LEVEL1, "allBits for Seg1 %x, paCurr %x, "
+ dev_dbg(bridge, "allBits for Seg1 %x, paCurr %x, "
"vaCurr %x, numBytes %x\n", allBits, paCurr, vaCurr,
numBytes);
for (i = 0; i < 4; i++) {
@@ -589,8 +588,8 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr)
aEProc[ndx].endianism = HW_LITTLE_ENDIAN;
aEProc[ndx].elemSize = HW_ELEM_SIZE_16BIT;
aEProc[ndx].mixedMode = HW_MMU_CPUES;
- DBG_Trace(DBG_LEVEL1, "SHM MMU TLB entry PA %lx"
- " VA %lx DSP_VA %lx Size %lx\n",
+ dev_dbg(bridge, "SHM MMU TLB entry PA %x"
+ " VA %x DSP_VA %x Size %x\n",
aEProc[ndx].ulGppPa,
aEProc[ndx].ulGppVa,
aEProc[ndx].ulDspVa *
@@ -600,8 +599,8 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr)
status = hIOMgr->pIntfFxns->pfnBrdMemMap(
hIOMgr->hWmdContext, paCurr, vaCurr, pgSize[i],
mapAttrs);
- DBG_Trace(DBG_LEVEL1, "SHM MMU PTE entry PA %lx"
- " VA %lx DSP_VA %lx Size %lx\n",
+ dev_dbg(bridge, "SHM MMU PTE entry PA %x"
+ " VA %x DSP_VA %x Size %x\n",
aEProc[ndx].ulGppPa,
aEProc[ndx].ulGppVa,
aEProc[ndx].ulDspVa *
@@ -637,7 +636,7 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr)
0x100000 / hIOMgr->uWordSize && hIOMgr->
extProcInfo.tyTlb[i].ulDspVirt
<= ulDspVa + ulSegSize / hIOMgr->uWordSize)) {
- DBG_Trace(DBG_LEVEL7, "CDB MMU entry %d conflicts with "
+ dev_dbg(bridge, "CDB MMU entry %d conflicts with "
"SHM.\n\tCDB: GppPa %x, DspVa %x.\n\tSHM: "
"GppPa %x, DspVa %x, Bytes %x.\n", i,
hIOMgr->extProcInfo.tyTlb[i].ulGppPhys,
@@ -653,7 +652,7 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr)
aEProc[ndx].ulGppVa = 0;
/* Can't convert, so set to zero */
aEProc[ndx].ulSize = 0x100000; /* 1 MB */
- DBG_Trace(DBG_LEVEL1, "SHM MMU entry PA %x "
+ dev_dbg(bridge, "SHM MMU entry PA %x "
"DSP_VA 0x%x\n", aEProc[ndx].ulGppPa,
aEProc[ndx].ulDspVa);
ndx++;
@@ -755,15 +754,15 @@ DSP_STATUS WMD_IO_OnLoaded(struct IO_MGR *hIOMgr)
hIOMgr->pMsgOutput = (u8 *)hIOMgr->pMsgOutputCtrl + sizeof(struct MSG);
hMsgMgr->uMaxMsgs = ((u8 *)hIOMgr->pMsgOutputCtrl - hIOMgr->pMsgInput)
/ sizeof(struct MSG_DSPMSG);
- DBG_Trace(DBG_LEVEL7, "IO MGR SHM details : pSharedMem 0x%x, "
- "pInput 0x%x, pOutput 0x%x, pMsgInputCtrl 0x%x, "
- "pMsgInput 0x%x, pMsgOutputCtrl 0x%x, pMsgOutput "
- "0x%x \n", (u8 *)hIOMgr->pSharedMem, (u8 *)hIOMgr->pInput,
- (u8 *)hIOMgr->pOutput, (u8 *)hIOMgr->pMsgInputCtrl,
- (u8 *)hIOMgr->pMsgInput, (u8 *)hIOMgr->pMsgOutputCtrl,
- (u8 *)hIOMgr->pMsgOutput);
- DBG_Trace(DBG_LEVEL7, "** (proc) MAX MSGS IN SHARED MEMORY: "
- "0x%x\n", hMsgMgr->uMaxMsgs);
+ dev_dbg(bridge, "IO MGR SHM details: pSharedMem %p, pInput %p, "
+ "pOutput %p, pMsgInputCtrl %p, pMsgInput %p, "
+ "pMsgOutputCtrl %p, pMsgOutput %p\n",
+ (u8 *)hIOMgr->pSharedMem, hIOMgr->pInput,
+ hIOMgr->pOutput, (u8 *)hIOMgr->pMsgInputCtrl,
+ hIOMgr->pMsgInput, (u8 *)hIOMgr->pMsgOutputCtrl,
+ hIOMgr->pMsgOutput);
+ dev_dbg(bridge, "(proc) Mas msgs in shared memory: 0x%x\n",
+ hMsgMgr->uMaxMsgs);
memset((void *) hIOMgr->pSharedMem, 0, sizeof(struct SHM));
#ifndef DSP_TRACEBUF_DISABLED
@@ -901,8 +900,7 @@ static void IO_DispatchPM(struct work_struct *work)
/* Send the command to the WMD clk/pwr manager to handle */
if (pArg[0] == MBX_PM_HIBERNATE_EN) {
- DBG_Trace(DBG_LEVEL7, "IO_DispatchPM : Hibernate "
- "command\n");
+ dev_dbg(bridge, "PM: Hibernate command\n");
status = pIOMgr->pIntfFxns->pfnDevCntrl(pIOMgr->
hWmdContext, WMDIOCTL_PWR_HIBERNATE, pArg);
if (DSP_FAILED(status))
@@ -910,27 +908,23 @@ static void IO_DispatchPM(struct work_struct *work)
__func__, status);
} else if (pArg[0] == MBX_PM_OPP_REQ) {
pArg[1] = pIOMgr->pSharedMem->oppRequest.rqstOppPt;
- DBG_Trace(DBG_LEVEL7, "IO_DispatchPM : Value of OPP "
- "value =0x%x \n", pArg[1]);
+ dev_dbg(bridge, "PM: Requested OPP = 0x%x\n", pArg[1]);
status = pIOMgr->pIntfFxns->pfnDevCntrl(pIOMgr->
hWmdContext, WMDIOCTL_CONSTRAINT_REQUEST,
pArg);
if (DSP_FAILED(status)) {
- DBG_Trace(DBG_LEVEL7, "IO_DispatchPM : Failed "
- "to set constraint = 0x%x \n",
- pArg[1]);
+ dev_dbg(bridge, "PM: Failed to set constraint "
+ "= 0x%x \n", pArg[1]);
}
} else {
- DBG_Trace(DBG_LEVEL7, "IO_DispatchPM - clock control - "
- "value of msg = 0x%x: \n", pArg[0]);
+ dev_dbg(bridge, "PM: clk control value of msg = 0x%x\n",
+ pArg[0]);
status = pIOMgr->pIntfFxns->pfnDevCntrl(pIOMgr->
hWmdContext, WMDIOCTL_CLK_CTRL, pArg);
- if (DSP_FAILED(status)) {
- DBG_Trace(DBG_LEVEL7, "IO_DispatchPM : Failed "
- "to control the DSP clk = 0x%x \n",
- *pArg);
- }
+ if (DSP_FAILED(status))
+ dev_dbg(bridge, "PM: Failed to ctrl the DSP clk"
+ "= 0x%x\n", *pArg);
}
/* Increment the tail count here */
pIOMgr->iQuePowerTail++;
@@ -1309,7 +1303,7 @@ static void InputMsg(struct IO_MGR *pIOMgr, struct MSG_MGR *hMsgMgr)
/* Determine which queue to put the message in */
hMsgQueue = (struct MSG_QUEUE *)LST_First(hMsgMgr->queueList);
- DBG_Trace(DBG_LEVEL7, "InputMsg RECVD: dwCmd=0x%x dwArg1=0x%x "
+ dev_dbg(bridge, "input msg: dwCmd=0x%x dwArg1=0x%x "
"dwArg2=0x%x dwId=0x%x \n", msg.msg.dwCmd,
msg.msg.dwArg1, msg.msg.dwArg2, msg.dwId);
/*
@@ -1759,34 +1753,28 @@ DSP_STATUS IO_SHMsetting(struct IO_MGR *hIOMgr, u8 desc, void *pArgs)
for (i = 0; i <= dsp_max_opps; i++) {
hIOMgr->pSharedMem->oppTableStruct.oppPoint[i].voltage =
vdd1_dsp_freq[i][0];
- DBG_Trace(DBG_LEVEL5, "OPP shared memory -voltage: "
- "%d\n", hIOMgr->pSharedMem->oppTableStruct.
- oppPoint[i].voltage);
+ dev_dbg(bridge, "OPP-SHM: voltage: %d\n",
+ vdd1_dsp_freq[i][0]);
hIOMgr->pSharedMem->oppTableStruct.oppPoint[i].
frequency = vdd1_dsp_freq[i][1];
- DBG_Trace(DBG_LEVEL5, "OPP shared memory -frequency: "
- "%d\n", hIOMgr->pSharedMem->oppTableStruct.
- oppPoint[i].frequency);
+ dev_dbg(bridge, "OPP-SHM: frequency: %d\n",
+ vdd1_dsp_freq[i][1]);
hIOMgr->pSharedMem->oppTableStruct.oppPoint[i].minFreq =
vdd1_dsp_freq[i][2];
- DBG_Trace(DBG_LEVEL5, "OPP shared memory -min value: "
- "%d\n", hIOMgr->pSharedMem->oppTableStruct.
- oppPoint[i].minFreq);
+ dev_dbg(bridge, "OPP-SHM: min freq: %d\n",
+ vdd1_dsp_freq[i][2]);
hIOMgr->pSharedMem->oppTableStruct.oppPoint[i].maxFreq =
vdd1_dsp_freq[i][3];
- DBG_Trace(DBG_LEVEL5, "OPP shared memory -max value: "
- "%d\n", hIOMgr->pSharedMem->oppTableStruct.
- oppPoint[i].maxFreq);
+ dev_dbg(bridge, "OPP-SHM: max freq: %d\n",
+ vdd1_dsp_freq[i][3]);
}
hIOMgr->pSharedMem->oppTableStruct.numOppPts = dsp_max_opps;
- DBG_Trace(DBG_LEVEL5, "OPP shared memory - max OPP number: "
- "%d\n", hIOMgr->pSharedMem->oppTableStruct.numOppPts);
+ dev_dbg(bridge, "OPP-SHM: max OPP number: %d\n", dsp_max_opps);
/* Update the current OPP number */
if (pdata->dsp_get_opp)
i = (*pdata->dsp_get_opp)();
hIOMgr->pSharedMem->oppTableStruct.currOppPt = i;
- DBG_Trace(DBG_LEVEL7, "OPP value programmed to shared memory: "
- "%d\n", i);
+ dev_dbg(bridge, "OPP-SHM: value programmed = %d\n", i);
break;
case SHM_GETOPP:
/* Get the OPP that DSP has requested */
@@ -1811,7 +1799,7 @@ DSP_STATUS WMD_IO_GetProcLoad(IN struct IO_MGR *hIOMgr,
pProcStat->uCurrDspFreq = hIOMgr->pSharedMem->loadMonInfo.currDspFreq;
pProcStat->uPredictedFreq = hIOMgr->pSharedMem->loadMonInfo.predDspFreq;
- DBG_Trace(DBG_LEVEL4, "Curr Load =%d, Pred Load = %d, Curr Freq = %d, "
+ dev_dbg(bridge, "Curr Load = %d, Pred Load = %d, Curr Freq = %d, "
"Pred Freq = %d\n", pProcStat->uCurrLoad,
pProcStat->uPredictedLoad, pProcStat->uCurrDspFreq,
pProcStat->uPredictedFreq);
diff --git a/drivers/dsp/bridge/wmd/mmu_fault.c b/drivers/dsp/bridge/wmd/mmu_fault.c
index 14cfd62..1a9137d 100644
--- a/drivers/dsp/bridge/wmd/mmu_fault.c
+++ b/drivers/dsp/bridge/wmd/mmu_fault.c
@@ -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) {
diff --git a/drivers/dsp/bridge/wmd/tiomap3430.c b/drivers/dsp/bridge/wmd/tiomap3430.c
index 4563ca4..c91f919 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430.c
@@ -134,25 +134,25 @@ static void GetHWRegs(void __iomem *prm_base, void __iomem *cm_base)
{
u32 temp;
temp = __raw_readl((cm_base) + 0x00);
- DBG_Trace(DBG_LEVEL6, "CM_FCLKEN_IVA2 = 0x%x \n", temp);
+ dev_dbg(bridge, "CM_FCLKEN_IVA2 = 0x%x\n", temp);
temp = __raw_readl((cm_base) + 0x10);
- DBG_Trace(DBG_LEVEL6, "CM_ICLKEN1_IVA2 = 0x%x \n", temp);
+ dev_dbg(bridge, "CM_ICLKEN1_IVA2 = 0x%x \n", temp);
temp = __raw_readl((cm_base) + 0x20);
- DBG_Trace(DBG_LEVEL6, "CM_IDLEST_IVA2 = 0x%x \n", temp);
+ dev_dbg(bridge, "CM_IDLEST_IVA2 = 0x%x \n", temp);
temp = __raw_readl((cm_base) + 0x48);
- DBG_Trace(DBG_LEVEL6, "CM_CLKSTCTRL_IVA2 = 0x%x \n", temp);
+ dev_dbg(bridge, "CM_CLKSTCTRL_IVA2 = 0x%x \n", temp);
temp = __raw_readl((cm_base) + 0x4c);
- DBG_Trace(DBG_LEVEL6, "CM_CLKSTST_IVA2 = 0x%x \n", temp);
+ dev_dbg(bridge, "CM_CLKSTST_IVA2 = 0x%x \n", temp);
temp = __raw_readl((prm_base) + 0x50);
- DBG_Trace(DBG_LEVEL6, "RM_RSTCTRL_IVA2 = 0x%x \n", temp);
+ dev_dbg(bridge, "RM_RSTCTRL_IVA2 = 0x%x \n", temp);
temp = __raw_readl((prm_base) + 0x58);
- DBG_Trace(DBG_LEVEL6, "RM_RSTST_IVA2 = 0x%x \n", temp);
+ dev_dbg(bridge, "RM_RSTST_IVA2 = 0x%x \n", temp);
temp = __raw_readl((prm_base) + 0xE0);
- DBG_Trace(DBG_LEVEL6, "PM_PWSTCTRL_IVA2 = 0x%x \n", temp);
+ dev_dbg(bridge, "PM_PWSTCTRL_IVA2 = 0x%x \n", temp);
temp = __raw_readl((prm_base) + 0xE4);
- DBG_Trace(DBG_LEVEL6, "PM_PWSTST_IVA2 = 0x%x \n", temp);
+ dev_dbg(bridge, "PM_PWSTST_IVA2 = 0x%x \n", temp);
temp = __raw_readl((cm_base) + 0xA10);
- DBG_Trace(DBG_LEVEL6, "CM_ICLKEN1_CORE = 0x%x \n", temp);
+ dev_dbg(bridge, "CM_ICLKEN1_CORE = 0x%x \n", temp);
}
#else
static inline void GetHWRegs(void __iomem *prm_base, void __iomem *cm_base)
@@ -300,7 +300,7 @@ void WMD_DRV_Entry(OUT struct WMD_DRV_INTERFACE **ppDrvInterface,
if (strcmp(pstrWMDFileName, "UMA") == 0)
*ppDrvInterface = &drvInterfaceFxns;
else
- DBG_Trace(DBG_LEVEL7, "WMD_DRV_Entry Unknown WMD file name");
+ dev_dbg(bridge, "%s Unknown WMD file name", __func__);
}
@@ -473,16 +473,14 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext,
HW_RST_Reset(resources.dwPrmBase, HW_RST1_IVA2);
if (dsp_debug) {
/* Set the bootmode to self loop */
- DBG_Trace(DBG_LEVEL7,
- "Set boot mode to self loop"
+ dev_dbg(bridge, "Set boot mode to self loop"
" for IVA2 Device\n");
HW_DSPSS_BootModeSet(resources.dwSysCtrlBase,
HW_DSPSYSC_SELFLOOPBOOT, dwDSPAddr);
} else {
/* Set the bootmode to '0' - direct boot */
- DBG_Trace(DBG_LEVEL7,
- "Set boot mode to direct"
- " boot for IVA2 Device \n");
+ dev_dbg(bridge, "Set boot mode to direct boot"
+ " for IVA2 Device\n");
HW_DSPSS_BootModeSet(resources.dwSysCtrlBase,
HW_DSPSYSC_DIRECTBOOT, dwDSPAddr);
}
@@ -507,7 +505,7 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext,
iEntryNdx++) {
if ((pDevContext->aTLBEntry[iEntryNdx].ulGppPa != 0) &&
(pDevContext->aTLBEntry[iEntryNdx].ulDspVa != 0)) {
- DBG_Trace(DBG_LEVEL4, "** (proc) MMU %d GppPa:"
+ dev_dbg(bridge, "(proc) MMU %d GppPa:"
" 0x%x DspVa 0x%x Size 0x%x\n",
itmpEntryNdx,
pDevContext->aTLBEntry[iEntryNdx].ulGppPa,
@@ -582,8 +580,7 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext,
DSPPeripheralClkCtrl(pDevContext, &uClkCmd);
} else {
- DBG_Trace(DBG_LEVEL7,
- "Not able to get the symbol for Load "
+ dev_dbg(bridge, "Not able to get the symbol for Load "
"Monitor Timer\n");
}
}
@@ -618,8 +615,7 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext,
DSPPeripheralClkCtrl(pDevContext, &uClkCmd);
} else {
- DBG_Trace(DBG_LEVEL7,
- "Not able to get the symbol for BIOS Timer\n");
+ dev_dbg(bridge, "Not able to get the symbol for BIOS Timer\n");
}
}
@@ -637,9 +633,8 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext,
/* Get the clock rate */
status = CLK_GetRate(SERVICESCLK_iva2_ck,
&ulDspClkRate);
- DBG_Trace(DBG_LEVEL5,
- "WMD_BRD_Start: DSP clock rate (KHZ): 0x%x \n",
- ulDspClkRate);
+ dev_dbg(bridge, "%s: DSP clock rate (KHZ): 0x%x \n",
+ __func__, ulDspClkRate);
(void)WMD_BRD_Write(pDevContext, (u8 *)&ulDspClkRate,
ulDspClkAddr, sizeof(u32), 0);
}
@@ -675,17 +670,15 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext,
(void)CHNLSM_EnableInterrupt(pDevContext);
/* Let DSP go */
- DBG_Trace(DBG_LEVEL7, "Unreset, WMD_BRD_Start\n");
+ dev_dbg(bridge, "%s Unreset\n", __func__);
/* Enable DSP MMU Interrupts */
HW_MMU_EventEnable(resources.dwDmmuBase,
HW_MMU_ALL_INTERRUPTS);
/* release the RST1, DSP starts executing now .. */
HW_RST_UnReset(resources.dwPrmBase, HW_RST1_IVA2);
- DBG_Trace(DBG_LEVEL7, "Driver waiting for Sync @ 0x%x \n",
- dwSyncAddr);
- DBG_Trace(DBG_LEVEL7, "DSP c_int00 Address = 0x%x \n",
- dwDSPAddr);
+ dev_dbg(bridge, "Waiting for Sync @ 0x%x\n", dwSyncAddr);
+ dev_dbg(bridge, "DSP c_int00 Address = 0x%x\n", dwDSPAddr);
if (dsp_debug)
while (*((volatile u16 *)dwSyncAddr))
;
@@ -997,12 +990,12 @@ static DSP_STATUS WMD_DEV_Create(OUT struct WMD_DEV_CONTEXT **ppDevContext,
pPtAttrs->pgInfo = MEM_Calloc(pPtAttrs->L2NumPages *
sizeof(struct PageInfo), MEM_NONPAGED);
- DBG_Trace(DBG_LEVEL1, "L1 pa %x, va %x, size %x\n L2 pa %x, va "
+ dev_dbg(bridge, "L1 pa %x, va %x, size %x\n L2 pa %x, va "
"%x, size %x\n", pPtAttrs->L1BasePa,
pPtAttrs->L1BaseVa, pPtAttrs->L1size,
pPtAttrs->L2BasePa, pPtAttrs->L2BaseVa,
pPtAttrs->L2size);
- DBG_Trace(DBG_LEVEL1, "pPtAttrs %x L2 NumPages %x pgInfo %x\n",
+ dev_dbg(bridge, "pPtAttrs %p L2 NumPages %x pgInfo %p\n",
pPtAttrs, pPtAttrs->L2NumPages, pPtAttrs->pgInfo);
}
if ((pPtAttrs != NULL) && (pPtAttrs->L1BaseVa != 0) &&
@@ -1249,9 +1242,9 @@ static DSP_STATUS WMD_BRD_MemMap(struct WMD_DEV_CONTEXT *hDevContext,
u32 pgI = 0;
u32 mpuAddr, pa;
- DBG_Trace(DBG_ENTER, "> WMD_BRD_MemMap hDevContext %x, pa %x, va %x, "
- "size %x, ulMapAttr %x\n", hDevContext, ulMpuAddr, ulVirtAddr,
- ulNumBytes, ulMapAttr);
+ dev_dbg(bridge, "%s hDevCtxt %p, pa %x, va %x, size %x, ulMapAttr %x\n",
+ __func__, hDevContext, ulMpuAddr, ulVirtAddr,
+ ulNumBytes, ulMapAttr);
if (ulNumBytes == 0)
return DSP_EINVALIDARG;
@@ -1319,10 +1312,10 @@ static DSP_STATUS WMD_BRD_MemMap(struct WMD_DEV_CONTEXT *hDevContext,
down_read(&mm->mmap_sem);
vma = find_vma(mm, ulMpuAddr);
if (vma)
- DBG_Trace(DBG_LEVEL6, "VMAfor UserBuf: ulMpuAddr=%x, "
- "ulNumBytes=%x, vm_start=%x vm_end=%x vm_flags=%x \n",
- ulMpuAddr, ulNumBytes, vma->vm_start,
- vma->vm_end, vma->vm_flags);
+ dev_dbg(bridge, "VMAfor UserBuf: ulMpuAddr=%x, ulNumBytes=%x, "
+ "vm_start=%lx, vm_end=%lx, vm_flags=%lx\n",
+ ulMpuAddr, ulNumBytes, vma->vm_start,
+ vma->vm_end, vma->vm_flags);
/*
* It is observed that under some circumstances, the user buffer is
@@ -1332,10 +1325,10 @@ static DSP_STATUS WMD_BRD_MemMap(struct WMD_DEV_CONTEXT *hDevContext,
while ((vma) && (ulMpuAddr + ulNumBytes > vma->vm_end)) {
/* jump to the next VMA region */
vma = find_vma(mm, vma->vm_end + 1);
- DBG_Trace(DBG_LEVEL6, "VMAfor UserBuf ulMpuAddr=%x, "
- "ulNumBytes=%x, vm_start=%x vm_end=%x vm_flags=%x\n",
- ulMpuAddr, ulNumBytes, vma->vm_start,
- vma->vm_end, vma->vm_flags);
+ dev_dbg(bridge, "VMA for UserBuf ulMpuAddr=%x ulNumBytes=%x, "
+ "vm_start=%lx, vm_end=%lx, vm_flags=%lx\n",
+ ulMpuAddr, ulNumBytes, vma->vm_start,
+ vma->vm_end, vma->vm_flags);
}
if (!vma) {
pr_err("%s: Failed to get VMA region for 0x%x (%d)\n",
@@ -1436,7 +1429,7 @@ func_cont:
* region
*/
flush_all(pDevContext);
- DBG_Trace(DBG_ENTER, "< WMD_BRD_MemMap status %x\n", status);
+ dev_dbg(bridge, "%s status %x\n", __func__, status);
return status;
}
@@ -1471,16 +1464,15 @@ static DSP_STATUS WMD_BRD_MemUnMap(struct WMD_DEV_CONTEXT *hDevContext,
u32 pAddr;
u32 numof4KPages = 0;
- DBG_Trace(DBG_ENTER, "> WMD_BRD_MemUnMap hDevContext %x, va %x, "
- "NumBytes %x\n", hDevContext, ulVirtAddr, ulNumBytes);
vaCurr = ulVirtAddr;
remBytes = ulNumBytes;
remBytesL2 = 0;
L1BaseVa = pt->L1BaseVa;
pteAddrL1 = HW_MMU_PteAddrL1(L1BaseVa, vaCurr);
- DBG_Trace(DBG_ENTER, "WMD_BRD_MemUnMap L1BaseVa %x, pteAddrL1 %x "
- "vaCurr %x remBytes %x\n", L1BaseVa, pteAddrL1,
- vaCurr, remBytes);
+ dev_dbg(bridge, "%s hDevContext %p, va %x, NumBytes %x L1BaseVa %x, "
+ "pteAddrL1 %x\n", __func__, hDevContext, ulVirtAddr,
+ ulNumBytes, L1BaseVa, pteAddrL1);
+
while (remBytes && (DSP_SUCCEEDED(status))) {
u32 vaCurrOrig = vaCurr;
/* Find whether the L1 PTE points to a valid L2 PT */
@@ -1632,10 +1624,9 @@ skip_coarse_page:
*/
EXIT_LOOP:
flush_all(pDevContext);
- DBG_Trace(DBG_LEVEL1, "WMD_BRD_MemUnMap vaCurr %x, pteAddrL1 %x "
- "pteAddrL2 %x\n", vaCurr, pteAddrL1, pteAddrL2);
- DBG_Trace(DBG_ENTER, "< WMD_BRD_MemUnMap status %x remBytes %x, "
- "remBytesL2 %x\n", status, remBytes, remBytesL2);
+ dev_dbg(bridge, "%s: vaCurr %x, pteAddrL1 %x pteAddrL2 %x remBytes %x,"
+ " remBytesL2 %x status %x\n", __func__, vaCurr, pteAddrL1,
+ pteAddrL2, remBytes, remBytesL2, status);
return status;
}
@@ -1783,19 +1774,19 @@ static DSP_STATUS PteSet(struct PgTableAttrs *pt, u32 pa, u32 va,
pt->pgInfo[L2PageNum].numEntries += 16;
else
pt->pgInfo[L2PageNum].numEntries++;
- DBG_Trace(DBG_LEVEL1, "L2 BaseVa %x, BasePa %x, "
- "PageNum %x numEntries %x\n", L2BaseVa,
- L2BasePa, L2PageNum,
- pt->pgInfo[L2PageNum].numEntries);
+ dev_dbg(bridge, "PTE: L2 BaseVa %x, BasePa %x, PageNum "
+ "%x, numEntries %x\n", L2BaseVa,
+ L2BasePa, L2PageNum,
+ pt->pgInfo[L2PageNum].numEntries);
}
SYNC_LeaveCS(pt->hCSObj);
}
if (DSP_SUCCEEDED(status)) {
- DBG_Trace(DBG_LEVEL1, "PTE pgTblVa %x, pa %x, va %x, size %x\n",
- pgTblVa, pa, va, size);
- DBG_Trace(DBG_LEVEL1, "PTE endianism %x, elementSize %x, "
- "mixedSize %x\n", attrs->endianism,
- attrs->elementSize, attrs->mixedSize);
+ dev_dbg(bridge, "PTE: pgTblVa %x, pa %x, va %x, size %x\n",
+ pgTblVa, pa, va, size);
+ dev_dbg(bridge, "PTE: endianism %x, elementSize %x, "
+ "mixedSize %x\n", attrs->endianism,
+ attrs->elementSize, attrs->mixedSize);
status = HW_MMU_PteSet(pgTblVa, pa, va, size, attrs);
}
@@ -1866,14 +1857,11 @@ static DSP_STATUS MemMapVmalloc(struct WMD_DEV_CONTEXT *pDevContext,
vaCurr += sizeCurr;
}
/* Don't propogate Linux or HW status to upper layers */
- if (DSP_SUCCEEDED(status)) {
+ if (DSP_SUCCEEDED(status))
status = DSP_SOK;
- DBG_Trace(DBG_LEVEL7, "< WMD_BRD_MemMap succeeded %x\n",
- status);
- } else {
- DBG_Trace(DBG_LEVEL7, "< WMD_BRD_MemMap status %x\n", status);
+ else
status = DSP_EFAIL;
- }
+
/*
* In any case, flush the TLB
* This is called from here instead from PteUpdate to avoid unnecessary
@@ -1881,6 +1869,7 @@ static DSP_STATUS MemMapVmalloc(struct WMD_DEV_CONTEXT *pDevContext,
* region
*/
flush_all(pDevContext);
+ dev_dbg(bridge, "%s status %x\n", __func__, status);
return status;
}
@@ -1897,12 +1886,10 @@ void configureDspMmu(struct WMD_DEV_CONTEXT *pDevContext, u32 dataBasePhys,
struct HW_MMUMapAttrs_t mapAttrs = { endianism, elemSize, mixedSize };
DBC_Require(sizeInBytes > 0);
- DBG_Trace(DBG_LEVEL1,
- "configureDspMmu entry %x pa %x, va %x, bytes %x ",
- nEntryStart, dataBasePhys, dspBaseVirt, sizeInBytes);
-
- DBG_Trace(DBG_LEVEL1, "endianism %x, elemSize %x, mixedSize %x\n",
- endianism, elemSize, mixedSize);
+ dev_dbg(bridge, "%s: entry %x pa %x, va %x, bytes %x endianism %x, "
+ "elemSize %x, mixedSize %x", __func__, nEntryStart,
+ dataBasePhys, dspBaseVirt, sizeInBytes, endianism,
+ elemSize, mixedSize);
HW_MMU_TLBAdd(pDevContext->dwDSPMmuBase, dataBasePhys,
dspBaseVirt, sizeInBytes, nEntryStart,
diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
index 9469c5e..bdff0a7 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
@@ -72,8 +72,8 @@ DSP_STATUS handle_constraints_set(struct WMD_DEV_CONTEXT *pDevContext,
pConstraintVal = (u32 *)(pArgs);
/* Read the target value requested by DSP */
- DBG_Trace(DBG_LEVEL7, "handle_constraints_set:"
- "opp requested = 0x%x\n", (u32)*(pConstraintVal+1));
+ dev_dbg(bridge, "OPP: %s opp requested = 0x%x\n", __func__,
+ (u32)*(pConstraintVal+1));
/* Set the new opp value */
if (pdata->dsp_set_min_opp)
@@ -182,9 +182,8 @@ DSP_STATUS SleepDSP(struct WMD_DEV_CONTEXT *pDevContext, IN u32 dwCmd,
if (dsp_test_sleepstate == HW_PWR_STATE_OFF) {
CHNLSM_InterruptDSP2(pDevContext,
MBX_PM_DSPHIBERNATE);
- DBG_Trace(DBG_LEVEL7,
- "SleepDSP - Sent hibernate "
- "command to DSP\n");
+ dev_dbg(bridge, "PM: %s - sent hibernate cmd to DSP\n",
+ __func__);
targetPwrState = HW_PWR_STATE_OFF;
} else {
CHNLSM_InterruptDSP2(pDevContext,
@@ -204,16 +203,14 @@ DSP_STATUS SleepDSP(struct WMD_DEV_CONTEXT *pDevContext, IN u32 dwCmd,
case BRD_HIBERNATION:
case BRD_DSP_HIBERNATION:
/* Already in Hibernation, so just return */
- DBG_Trace(DBG_LEVEL7, "SleepDSP- DSP already in "
- "hibernation\n");
+ dev_dbg(bridge, "PM: %s - DSP already in hibernation\n",
+ __func__);
return DSP_SOK;
case BRD_STOPPED:
- DBG_Trace(DBG_LEVEL7,
- "SleepDSP- Board in STOP state \n");
+ dev_dbg(bridge, "PM: %s - Board in STOP state\n", __func__);
return DSP_SALREADYASLEEP;
default:
- DBG_Trace(DBG_LEVEL7,
- "SleepDSP- Bridge in Illegal state\n");
+ dev_dbg(bridge, "PM: %s - Bridge in Illegal state\n", __func__);
return DSP_EFAIL;
}
@@ -396,8 +393,7 @@ DSP_STATUS DSPPeripheralClkCtrl(struct WMD_DEV_CONTEXT *pDevContext,
}
break;
default:
- DBG_Trace(DBG_LEVEL3,
- "DSPPeripheralClkCtrl : Unsupported CMD \n");
+ dev_dbg(bridge, "%s: Unsupported CMD\n", __func__);
/* unsupported cmd */
/* TODO -- provide support for AUTOIDLE Enable/Disable
* commands */
@@ -419,18 +415,16 @@ DSP_STATUS PreScale_DSP(struct WMD_DEV_CONTEXT *pDevContext, IN void *pArgs)
voltage_domain = *((u32 *)pArgs);
level = *((u32 *)pArgs + 1);
- DBG_Trace(DBG_LEVEL7, "PreScale_DSP: voltage_domain = %x, level = "
- "0x%x\n", voltage_domain, level);
+ dev_dbg(bridge, "OPP: %s voltage_domain = %x, level = 0x%x\n",
+ __func__, voltage_domain, level);
if ((pDevContext->dwBrdState == BRD_HIBERNATION) ||
(pDevContext->dwBrdState == BRD_RETENTION) ||
(pDevContext->dwBrdState == BRD_DSP_HIBERNATION)) {
- DBG_Trace(DBG_LEVEL7, "PreScale_DSP: IVA in sleep. "
- "No notification to DSP\n");
+ dev_dbg(bridge, "OPP: %s IVA in sleep. No message to DSP\n");
return DSP_SOK;
} else if ((pDevContext->dwBrdState == BRD_RUNNING)) {
/* Send a prenotificatio to DSP */
- DBG_Trace(DBG_LEVEL7,
- "PreScale_DSP: Sent notification to DSP\n");
+ dev_dbg(bridge, "OPP: %s sent notification to DSP\n", __func__);
CHNLSM_InterruptDSP2(pDevContext, MBX_PM_SETPOINT_PRENOTIFY);
return DSP_SOK;
} else {
@@ -459,25 +453,22 @@ DSP_STATUS PostScale_DSP(struct WMD_DEV_CONTEXT *pDevContext, IN void *pArgs)
voltage_domain = *((u32 *)pArgs);
level = *((u32 *)pArgs + 1);
- DBG_Trace(DBG_LEVEL7,
- "PostScale_DSP: voltage_domain = %x, level = 0x%x\n",
- voltage_domain, level);
+ dev_dbg(bridge, "OPP: %s voltage_domain = %x, level = 0x%x\n",
+ __func__, voltage_domain, level);
if ((pDevContext->dwBrdState == BRD_HIBERNATION) ||
(pDevContext->dwBrdState == BRD_RETENTION) ||
(pDevContext->dwBrdState == BRD_DSP_HIBERNATION)) {
/* Update the OPP value in shared memory */
IO_SHMsetting(hIOMgr, SHM_CURROPP, &level);
- DBG_Trace(DBG_LEVEL7,
- "PostScale_DSP: IVA in sleep. Wrote to shared "
- "memory \n");
+ dev_dbg(bridge, "OPP: %s IVA in sleep. Wrote to SHM\n",
+ __func__);
} else if ((pDevContext->dwBrdState == BRD_RUNNING)) {
/* Update the OPP value in shared memory */
IO_SHMsetting(hIOMgr, SHM_CURROPP, &level);
/* Send a post notification to DSP */
CHNLSM_InterruptDSP2(pDevContext, MBX_PM_SETPOINT_POSTNOTIFY);
- DBG_Trace(DBG_LEVEL7,
- "PostScale_DSP: Wrote to shared memory Sent post"
- " notification to DSP\n");
+ dev_dbg(bridge, "OPP: %s wrote to SHM. Sent post notification "
+ "to DSP\n", __func__);
} else {
status = DSP_EFAIL;
}
diff --git a/drivers/dsp/bridge/wmd/tiomap_sm.c b/drivers/dsp/bridge/wmd/tiomap_sm.c
index 50f54c2..3fa24cd 100644
--- a/drivers/dsp/bridge/wmd/tiomap_sm.c
+++ b/drivers/dsp/bridge/wmd/tiomap_sm.c
@@ -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; */
diff --git a/drivers/dsp/bridge/wmd/ue_deh.c b/drivers/dsp/bridge/wmd/ue_deh.c
index 031a1c8..618d6e2 100644
--- a/drivers/dsp/bridge/wmd/ue_deh.c
+++ b/drivers/dsp/bridge/wmd/ue_deh.c
@@ -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;
}
--
1.6.2.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 04/12] DSPBRIDGE: Change custom GT_trace for dev_dbg in pmgr
2010-02-18 21:37 ` [PATCH 03/12] DSPBRIDGE: Change custom GT_trace for dev_dbg in wmd Omar Ramirez Luna
@ 2010-02-18 21:37 ` Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 05/12] DSPBRIDGE: Change custom GT_trace for dev_dbg in services Omar Ramirez Luna
0 siblings, 1 reply; 14+ messages in thread
From: Omar Ramirez Luna @ 2010-02-18 21:37 UTC (permalink / raw)
To: linux-omap
Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
Omar Ramirez Luna
Remove GT_Trace custom debugging mechanism and use dev_dbg.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
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(-)
diff --git a/drivers/dsp/bridge/pmgr/cmm.c b/drivers/dsp/bridge/pmgr/cmm.c
index 56f97a7..b30b724 100644
--- a/drivers/dsp/bridge/pmgr/cmm.c
+++ b/drivers/dsp/bridge/pmgr/cmm.c
@@ -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;
diff --git a/drivers/dsp/bridge/pmgr/cod.c b/drivers/dsp/bridge/pmgr/cod.c
index 541503c..62629e1 100644
--- a/drivers/dsp/bridge/pmgr/cod.c
+++ b/drivers/dsp/bridge/pmgr/cod.c
@@ -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,
diff --git a/drivers/dsp/bridge/pmgr/dbll.c b/drivers/dsp/bridge/pmgr/dbll.c
index 9b31f41..86832a3 100644
--- a/drivers/dsp/bridge/pmgr/dbll.c
+++ b/drivers/dsp/bridge/pmgr/dbll.c
@@ -328,14 +328,14 @@ bool DBLL_getAddr(struct DBLL_LibraryObj *zlLib, char *name,
DBC_Require(ppSym != NULL);
DBC_Require(zlLib->symTab != NULL);
- GT_3trace(DBLL_debugMask, GT_ENTER,
- "DBLL_getAddr: lib: 0x%x name: %s pAddr:"
- " 0x%x\n", zlLib, name, ppSym);
sym = (struct Symbol *)GH_find(zlLib->symTab, name);
if (sym != NULL) {
*ppSym = &sym->value;
status = true;
}
+
+ dev_dbg(bridge, "%s: lib: %p name: %s pAddr: %p, status 0x%x\n",
+ __func__, zlLib, name, ppSym, status);
return status;
}
@@ -408,9 +408,6 @@ DSP_STATUS DBLL_getSect(struct DBLL_LibraryObj *lib, char *name, u32 *pAddr,
DBC_Require(pSize != NULL);
DBC_Require(MEM_IsValidHandle(zlLib, DBLL_LIBSIGNATURE));
- GT_4trace(DBLL_debugMask, GT_ENTER,
- "DBLL_getSect: lib: 0x%x name: %s pAddr:"
- " 0x%x pSize: 0x%x\n", lib, name, pAddr, pSize);
/* If DOFF file is not open, we open it. */
if (zlLib != NULL) {
if (zlLib->fp == NULL) {
@@ -445,6 +442,9 @@ DSP_STATUS DBLL_getSect(struct DBLL_LibraryObj *lib, char *name, u32 *pAddr,
fOpenedDoff = false;
}
+ dev_dbg(bridge, "%s: lib: %p name: %s pAddr: %p pSize: %p, "
+ "status 0x%x\n", __func__, lib, name, pAddr, pSize, status);
+
return status;
}
@@ -483,9 +483,6 @@ DSP_STATUS DBLL_load(struct DBLL_LibraryObj *lib, DBLL_Flags flags,
DBC_Require(pEntry != NULL);
DBC_Require(attrs != NULL);
- GT_4trace(DBLL_debugMask, GT_ENTER,
- "DBLL_load: lib: 0x%x flags: 0x%x pEntry:"
- " 0x%x\n", lib, flags, attrs, pEntry);
/*
* Load if not already loaded.
*/
@@ -579,6 +576,10 @@ DSP_STATUS DBLL_load(struct DBLL_LibraryObj *lib, DBLL_Flags flags,
dofClose(zlLib);
DBC_Ensure(DSP_FAILED(status) || zlLib->loadRef > 0);
+
+ dev_dbg(bridge, "%s: lib: %p flags: 0x%x pEntry: %p, status 0x%x\n",
+ __func__, lib, flags, pEntry, status);
+
return status;
}
@@ -611,9 +612,6 @@ DSP_STATUS DBLL_open(struct DBLL_TarObj *target, char *file, DBLL_Flags flags,
DBC_Require(file != NULL);
DBC_Require(pLib != NULL);
- GT_3trace(DBLL_debugMask, GT_ENTER,
- "DBLL_open: target: 0x%x file: %s pLib:"
- " 0x%x\n", target, file, pLib);
zlLib = zlTarget->head;
while (zlLib != NULL) {
if (strcmp(zlLib->fileName, file) == 0) {
@@ -733,6 +731,10 @@ func_cont:
DBC_Ensure((DSP_SUCCEEDED(status) && (zlLib->openRef > 0) &&
MEM_IsValidHandle(((struct DBLL_LibraryObj *)(*pLib)),
DBLL_LIBSIGNATURE)) || (DSP_FAILED(status) && *pLib == NULL));
+
+ dev_dbg(bridge, "%s: target: %p file: %s pLib: %p, status 0x%x\n",
+ __func__, target, file, pLib, status);
+
return status;
}
@@ -756,9 +758,6 @@ DSP_STATUS DBLL_readSect(struct DBLL_LibraryObj *lib, char *name,
DBC_Require(pContent != NULL);
DBC_Require(size != 0);
- GT_4trace(DBLL_debugMask, GT_ENTER,
- "DBLL_readSect: lib: 0x%x name: %s "
- "pContent: 0x%x size: 0x%x\n", lib, name, pContent, size);
/* If DOFF file is not open, we open it. */
if (zlLib != NULL) {
if (zlLib->fp == NULL) {
@@ -804,6 +803,9 @@ func_cont:
dofClose(zlLib);
fOpenedDoff = false;
}
+
+ dev_dbg(bridge, "%s: lib: %p name: %s pContent: %p size: 0x%x, "
+ "status 0x%x\n", __func__, lib, name, pContent, size, status);
return status;
}
@@ -834,7 +836,7 @@ void DBLL_unload(struct DBLL_LibraryObj *lib, struct DBLL_Attrs *attrs)
DBC_Require(cRefs > 0);
DBC_Require(MEM_IsValidHandle(zlLib, DBLL_LIBSIGNATURE));
DBC_Require(zlLib->loadRef > 0);
- GT_1trace(DBLL_debugMask, GT_ENTER, "DBLL_unload: lib: 0x%x\n", lib);
+ dev_dbg(bridge, "%s: lib: %p\n", __func__, lib);
zlLib->loadRef--;
/* Unload only if reference count is 0 */
if (zlLib->loadRef != 0)
@@ -846,8 +848,7 @@ void DBLL_unload(struct DBLL_LibraryObj *lib, struct DBLL_Attrs *attrs)
&zlLib->symbol.dlSymbol,
&zlLib->allocate.dlAlloc, &zlLib->init.dlInit);
if (err != 0) {
- GT_1trace(DBLL_debugMask, GT_5CLASS,
- "Dynamic_Unload_Module failed: 0x%x\n", err);
+ dev_dbg(bridge, "%s: failed: 0x%x\n", __func__, err);
}
}
/* remove symbols from symbol table */
@@ -1062,8 +1063,7 @@ static struct dynload_symbol *findSymbol(struct Dynamic_Loader_Sym *this,
}
if (!status && bGblSearch) {
- GT_1trace(DBLL_debugMask, GT_6CLASS,
- "findSymbol: Symbol not found: %s\n", name);
+ dev_dbg(bridge, "%s: Symbol not found: %s\n", __func__, name);
}
DBC_Assert((status && (pSym != NULL)) || (!status && (pSym == NULL)));
@@ -1121,9 +1121,8 @@ static struct dynload_symbol *addToSymbolTable(struct Dynamic_Loader_Sym *this,
bGblSearch = true;
if (pSym) {
bRedefinedSymbol = true;
- GT_1trace(DBLL_debugMask, GT_6CLASS,
- "Symbol already defined in "
- "symbol table: %s\n", name);
+ dev_dbg(bridge, "%s already defined in symbol table\n",
+ name);
return NULL;
}
}
@@ -1215,7 +1214,7 @@ static void errorReport(struct Dynamic_Loader_Sym *this, const char *errstr,
lib = pSymbol->lib;
DBC_Require(MEM_IsValidHandle(lib, DBLL_LIBSIGNATURE));
vsnprintf((char *)tempBuf, MAXEXPR, (char *)errstr, args);
- GT_1trace(DBLL_debugMask, GT_5CLASS, "%s\n", tempBuf);
+ dev_dbg(bridge, "%s\n", tempBuf);
}
/* Dynamic_Loader_Allocate */
@@ -1324,13 +1323,11 @@ func_cont:
if (!runAddrFlag)
info->run_addr = info->load_addr;
info->context = (u32)rmmAddr.segid;
- GT_3trace(DBLL_debugMask, GT_5CLASS,
- "Remote alloc: %s base = 0x%lx len"
- "= 0x%lx\n", info->name, info->load_addr / DSPWORDSIZE,
- info->size / DSPWORDSIZE);
- GT_2trace(DBLL_debugMask, GT_5CLASS,
- "info->run_addr = 0x%x, info->load_addr= 0x%x\n",
- info->run_addr, info->load_addr);
+ dev_dbg(bridge, "%s: %s base = 0x%x len = 0x%x, "
+ "info->run_addr 0x%x, info->load_addr 0x%x\n",
+ __func__, info->name, info->load_addr / DSPWORDSIZE,
+ info->size / DSPWORDSIZE, info->run_addr,
+ info->load_addr);
}
return retVal;
}
diff --git a/drivers/dsp/bridge/pmgr/dmm.c b/drivers/dsp/bridge/pmgr/dmm.c
index 2840674..098743f 100644
--- a/drivers/dsp/bridge/pmgr/dmm.c
+++ b/drivers/dsp/bridge/pmgr/dmm.c
@@ -289,9 +289,6 @@ DSP_STATUS DMM_MapMemory(struct DMM_OBJECT *hDmmMgr, u32 addr, u32 size)
struct MapPage *chunk;
DSP_STATUS status = DSP_SOK;
- GT_3trace(DMM_debugMask, GT_ENTER,
- "Entered DMM_MapMemory () hDmmMgr %x, "
- "addr %x, size %x\n", hDmmMgr, addr, size);
SYNC_EnterCS(pDmmObj->hDmmLock);
/* Find the Reserved memory chunk containing the DSP block to
* be mapped */
@@ -303,9 +300,10 @@ DSP_STATUS DMM_MapMemory(struct DMM_OBJECT *hDmmMgr, u32 addr, u32 size)
} else
status = DSP_ENOTFOUND;
SYNC_LeaveCS(pDmmObj->hDmmLock);
- GT_2trace(DMM_debugMask, GT_4CLASS,
- "Leaving DMM_MapMemory status %x, chunk %x\n",
- status, chunk);
+
+ dev_dbg(bridge, "%s hDmmMgr %p, addr %x, size %x\n\tstatus %x, "
+ "chunk %p", __func__, hDmmMgr, addr, size, status, chunk);
+
return status;
}
@@ -323,9 +321,6 @@ DSP_STATUS DMM_ReserveMemory(struct DMM_OBJECT *hDmmMgr, u32 size,
u32 rsvAddr = 0;
u32 rsvSize = 0;
- GT_3trace(DMM_debugMask, GT_ENTER,
- "Entered DMM_ReserveMemory () hDmmMgr %x, "
- "size %x, pRsvAddr %x\n", hDmmMgr, size, pRsvAddr);
SYNC_EnterCS(pDmmObj->hDmmLock);
/* Try to get a DSP chunk from the free list */
@@ -355,9 +350,11 @@ DSP_STATUS DMM_ReserveMemory(struct DMM_OBJECT *hDmmMgr, u32 size,
status = DSP_EMEMORY;
SYNC_LeaveCS(pDmmObj->hDmmLock);
- GT_3trace(DMM_debugMask, GT_4CLASS,
- "Leaving ReserveMemory status %x, rsvAddr"
- " %x, rsvSize %x\n", status, rsvAddr, rsvSize);
+
+ dev_dbg(bridge, "%s hDmmMgr %p, size %x, pRsvAddr %p\n\tstatus %x, "
+ "rsvAddr %x, rsvSize %x\n", __func__, hDmmMgr, size,
+ pRsvAddr, status, rsvAddr, rsvSize);
+
return status;
}
@@ -373,9 +370,6 @@ DSP_STATUS DMM_UnMapMemory(struct DMM_OBJECT *hDmmMgr, u32 addr, u32 *pSize)
struct MapPage *chunk;
DSP_STATUS status = DSP_SOK;
- GT_3trace(DMM_debugMask, GT_ENTER,
- "Entered DMM_UnMapMemory () hDmmMgr %x, "
- "addr %x, pSize %x\n", hDmmMgr, addr, pSize);
SYNC_EnterCS(pDmmObj->hDmmLock);
chunk = GetMappedRegion(addr) ;
if (chunk == NULL)
@@ -388,9 +382,9 @@ DSP_STATUS DMM_UnMapMemory(struct DMM_OBJECT *hDmmMgr, u32 addr, u32 *pSize)
chunk->MappedSize = 0;
}
SYNC_LeaveCS(pDmmObj->hDmmLock);
- GT_3trace(DMM_debugMask, GT_ENTER,
- "Leaving DMM_UnMapMemory status %x, chunk"
- " %x, *pSize %x\n", status, chunk, *pSize);
+
+ dev_dbg(bridge, "%s: hDmmMgr %p, addr %x, pSize %p\n\tstatus %x, "
+ "chunk %p\n", __func__, hDmmMgr, addr, pSize, status, chunk);
return status;
}
@@ -408,10 +402,6 @@ DSP_STATUS DMM_UnReserveMemory(struct DMM_OBJECT *hDmmMgr, u32 rsvAddr)
DSP_STATUS status = DSP_SOK;
u32 chunkSize;
- GT_2trace(DMM_debugMask, GT_ENTER,
- "Entered DMM_UnReserveMemory () hDmmMgr "
- "%x, rsvAddr %x\n", hDmmMgr, rsvAddr);
-
SYNC_EnterCS(pDmmObj->hDmmLock);
/* Find the chunk containing the reserved address */
@@ -441,9 +431,10 @@ DSP_STATUS DMM_UnReserveMemory(struct DMM_OBJECT *hDmmMgr, u32 rsvAddr)
*/
}
SYNC_LeaveCS(pDmmObj->hDmmLock);
- GT_2trace(DMM_debugMask, GT_ENTER,
- "Leaving DMM_UnReserveMemory status %x"
- " chunk %x\n", status, chunk);
+
+ dev_dbg(bridge, "%s: hDmmMgr %p, rsvAddr %x\n\tstatus %x chunk %p",
+ __func__, hDmmMgr, rsvAddr, status, chunk);
+
return status;
}
@@ -464,9 +455,9 @@ static struct MapPage *GetRegion(u32 aAddr)
if (i < TableSize)
currRegion = pVirtualMappingTable + i;
}
- GT_3trace(DMM_debugMask, GT_4CLASS,
- "Leaving GetRegion currRegion %x, iFreeRegion %d\n,"
- "iFreeSize %d\n", currRegion, iFreeRegion, iFreeSize) ;
+
+ dev_dbg(bridge, "%s: currRegion %p, iFreeRegion %d, iFreeSize %d\n",
+ __func__, currRegion, iFreeRegion, iFreeSize);
return currRegion;
}
diff --git a/drivers/dsp/bridge/pmgr/msg.c b/drivers/dsp/bridge/pmgr/msg.c
index 69f39a8..34bac4e 100644
--- a/drivers/dsp/bridge/pmgr/msg.c
+++ b/drivers/dsp/bridge/pmgr/msg.c
@@ -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);
}
/*
--
1.6.2.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 05/12] DSPBRIDGE: Change custom GT_trace for dev_dbg in services
2010-02-18 21:37 ` [PATCH 04/12] DSPBRIDGE: Change custom GT_trace for dev_dbg in pmgr Omar Ramirez Luna
@ 2010-02-18 21:37 ` Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 06/12] DSPBRIDGE: Remove GT_trace variables for rmgr Omar Ramirez Luna
0 siblings, 1 reply; 14+ messages in thread
From: Omar Ramirez Luna @ 2010-02-18 21:37 UTC (permalink / raw)
To: linux-omap
Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
Omar Ramirez Luna
Remove GT_Trace custom debugging mechanism and use dev_dbg.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
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(-)
diff --git a/drivers/dsp/bridge/services/cfg.c b/drivers/dsp/bridge/services/cfg.c
index d26f8b9..295ff11 100644
--- a/drivers/dsp/bridge/services/cfg.c
+++ b/drivers/dsp/bridge/services/cfg.c
@@ -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;
}
diff --git a/drivers/dsp/bridge/services/clk.c b/drivers/dsp/bridge/services/clk.c
index f8c417a..04d49bd 100644
--- a/drivers/dsp/bridge/services/clk.c
+++ b/drivers/dsp/bridge/services/clk.c
@@ -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,
diff --git a/drivers/dsp/bridge/services/regsup.c b/drivers/dsp/bridge/services/regsup.c
index 0c77fb2..04f6b3a 100644
--- a/drivers/dsp/bridge/services/regsup.c
+++ b/drivers/dsp/bridge/services/regsup.c
@@ -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;
}
--
1.6.2.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 06/12] DSPBRIDGE: Remove GT_trace variables for rmgr
2010-02-18 21:37 ` [PATCH 05/12] DSPBRIDGE: Change custom GT_trace for dev_dbg in services Omar Ramirez Luna
@ 2010-02-18 21:37 ` Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 07/12] DSPBRIDGE: Remove GT_trace variables for wmd Omar Ramirez Luna
0 siblings, 1 reply; 14+ messages in thread
From: Omar Ramirez Luna @ 2010-02-18 21:37 UTC (permalink / raw)
To: linux-omap
Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
Omar Ramirez Luna
This patch removes variables used to store masks and flags
used for the previous debug implementation.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
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(-)
diff --git a/drivers/dsp/bridge/rmgr/dbdcd.c b/drivers/dsp/bridge/rmgr/dbdcd.c
index 067f7a0..9fd05a0 100644
--- a/drivers/dsp/bridge/rmgr/dbdcd.c
+++ b/drivers/dsp/bridge/rmgr/dbdcd.c
@@ -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,
diff --git a/drivers/dsp/bridge/rmgr/disp.c b/drivers/dsp/bridge/rmgr/disp.c
index 8c05593..6ae3bcb 100644
--- a/drivers/dsp/bridge/rmgr/disp.c
+++ b/drivers/dsp/bridge/rmgr/disp.c
@@ -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++;
diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c
index f3e2632..177d676 100644
--- a/drivers/dsp/bridge/rmgr/drv.c
+++ b/drivers/dsp/bridge/rmgr/drv.c
@@ -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);
diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index 4045784..24246d5 100644
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -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)
diff --git a/drivers/dsp/bridge/rmgr/dspdrv.c b/drivers/dsp/bridge/rmgr/dspdrv.c
index 59c2ecb..0fdb150 100644
--- a/drivers/dsp/bridge/rmgr/dspdrv.c
+++ b/drivers/dsp/bridge/rmgr/dspdrv.c
@@ -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;
diff --git a/drivers/dsp/bridge/rmgr/mgr.c b/drivers/dsp/bridge/rmgr/mgr.c
index 73d7a66..e63aaa1 100644
--- a/drivers/dsp/bridge/rmgr/mgr.c
+++ b/drivers/dsp/bridge/rmgr/mgr.c
@@ -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)
diff --git a/drivers/dsp/bridge/rmgr/nldr.c b/drivers/dsp/bridge/rmgr/nldr.c
index fb5a788..5c1266d 100644
--- a/drivers/dsp/bridge/rmgr/nldr.c
+++ b/drivers/dsp/bridge/rmgr/nldr.c
@@ -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++;
diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c
index 48a7728..cb3d324 100644
--- a/drivers/dsp/bridge/rmgr/node.c
+++ b/drivers/dsp/bridge/rmgr/node.c
@@ -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;
diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
index d8137c8..8489cd3 100644
--- a/drivers/dsp/bridge/rmgr/proc.c
+++ b/drivers/dsp/bridge/rmgr/proc.c
@@ -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++;
diff --git a/drivers/dsp/bridge/rmgr/rmm.c b/drivers/dsp/bridge/rmgr/rmm.c
index 8cf66ce..188faba 100644
--- a/drivers/dsp/bridge/rmgr/rmm.c
+++ b/drivers/dsp/bridge/rmgr/rmm.c
@@ -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;
diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c
index 909a2b1..6b62e41 100644
--- a/drivers/dsp/bridge/rmgr/strm.c
+++ b/drivers/dsp/bridge/rmgr/strm.c
@@ -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++;
--
1.6.2.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 07/12] DSPBRIDGE: Remove GT_trace variables for wmd
2010-02-18 21:37 ` [PATCH 06/12] DSPBRIDGE: Remove GT_trace variables for rmgr Omar Ramirez Luna
@ 2010-02-18 21:37 ` Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 08/12] DSPBRIDGE: Remove GT_trace variables for pmgr Omar Ramirez Luna
0 siblings, 1 reply; 14+ messages in thread
From: Omar Ramirez Luna @ 2010-02-18 21:37 UTC (permalink / raw)
To: linux-omap
Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
Omar Ramirez Luna
This patch removes variables used to store masks and flags
used for the previous debug implementation.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
drivers/dsp/bridge/wmd/io_sm.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c
index 00262db..967fb17 100644
--- a/drivers/dsp/bridge/wmd/io_sm.c
+++ b/drivers/dsp/bridge/wmd/io_sm.c
@@ -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 */
}
--
1.6.2.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 08/12] DSPBRIDGE: Remove GT_trace variables for pmgr
2010-02-18 21:37 ` [PATCH 07/12] DSPBRIDGE: Remove GT_trace variables for wmd Omar Ramirez Luna
@ 2010-02-18 21:37 ` Omar Ramirez Luna
2010-02-18 21:38 ` [PATCH 09/12] DSPBRIDGE: Remove GT_trace variables for services Omar Ramirez Luna
0 siblings, 1 reply; 14+ messages in thread
From: Omar Ramirez Luna @ 2010-02-18 21:37 UTC (permalink / raw)
To: linux-omap
Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
Omar Ramirez Luna
This patch removes variables used to store masks and flags
used for the previous debug implementation.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
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(-)
diff --git a/drivers/dsp/bridge/pmgr/chnl.c b/drivers/dsp/bridge/pmgr/chnl.c
index 14a060c..cfece9c 100644
--- a/drivers/dsp/bridge/pmgr/chnl.c
+++ b/drivers/dsp/bridge/pmgr/chnl.c
@@ -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++;
diff --git a/drivers/dsp/bridge/pmgr/cmm.c b/drivers/dsp/bridge/pmgr/cmm.c
index b30b724..e8fed86 100644
--- a/drivers/dsp/bridge/pmgr/cmm.c
+++ b/drivers/dsp/bridge/pmgr/cmm.c
@@ -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++;
diff --git a/drivers/dsp/bridge/pmgr/cod.c b/drivers/dsp/bridge/pmgr/cod.c
index 62629e1..9552618 100644
--- a/drivers/dsp/bridge/pmgr/cod.c
+++ b/drivers/dsp/bridge/pmgr/cod.c
@@ -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++;
diff --git a/drivers/dsp/bridge/pmgr/dbll.c b/drivers/dsp/bridge/pmgr/dbll.c
index 86832a3..0970974 100644
--- a/drivers/dsp/bridge/pmgr/dbll.c
+++ b/drivers/dsp/bridge/pmgr/dbll.c
@@ -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++;
diff --git a/drivers/dsp/bridge/pmgr/dev.c b/drivers/dsp/bridge/pmgr/dev.c
index e4450bc..20faf87 100644
--- a/drivers/dsp/bridge/pmgr/dev.c
+++ b/drivers/dsp/bridge/pmgr/dev.c
@@ -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();
diff --git a/drivers/dsp/bridge/pmgr/dmm.c b/drivers/dsp/bridge/pmgr/dmm.c
index 098743f..9a1c6b0 100644
--- a/drivers/dsp/bridge/pmgr/dmm.c
+++ b/drivers/dsp/bridge/pmgr/dmm.c
@@ -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++;
diff --git a/drivers/dsp/bridge/pmgr/io.c b/drivers/dsp/bridge/pmgr/io.c
index c6a4168..846562a 100644
--- a/drivers/dsp/bridge/pmgr/io.c
+++ b/drivers/dsp/bridge/pmgr/io.c
@@ -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++;
diff --git a/drivers/dsp/bridge/pmgr/msg.c b/drivers/dsp/bridge/pmgr/msg.c
index 34bac4e..b7f3fc4 100644
--- a/drivers/dsp/bridge/pmgr/msg.c
+++ b/drivers/dsp/bridge/pmgr/msg.c
@@ -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);
diff --git a/drivers/dsp/bridge/pmgr/wcd.c b/drivers/dsp/bridge/pmgr/wcd.c
index 4b8ae3d..20a2b04 100644
--- a/drivers/dsp/bridge/pmgr/wcd.c
+++ b/drivers/dsp/bridge/pmgr/wcd.c
@@ -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();
--
1.6.2.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 09/12] DSPBRIDGE: Remove GT_trace variables for services
2010-02-18 21:37 ` [PATCH 08/12] DSPBRIDGE: Remove GT_trace variables for pmgr Omar Ramirez Luna
@ 2010-02-18 21:38 ` Omar Ramirez Luna
2010-02-18 21:38 ` [PATCH 10/12] DSPBRIDGE: Remove custom debugging implementation Omar Ramirez Luna
0 siblings, 1 reply; 14+ messages in thread
From: Omar Ramirez Luna @ 2010-02-18 21:38 UTC (permalink / raw)
To: linux-omap
Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
Omar Ramirez Luna
This patch removes variables used to store masks and flags
used for the previous debug implementation.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
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(-)
diff --git a/drivers/dsp/bridge/services/cfg.c b/drivers/dsp/bridge/services/cfg.c
index 295ff11..19c296e 100644
--- a/drivers/dsp/bridge/services/cfg.c
+++ b/drivers/dsp/bridge/services/cfg.c
@@ -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;
diff --git a/drivers/dsp/bridge/services/clk.c b/drivers/dsp/bridge/services/clk.c
index 04d49bd..d279036 100644
--- a/drivers/dsp/bridge/services/clk.c
+++ b/drivers/dsp/bridge/services/clk.c
@@ -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;
diff --git a/drivers/dsp/bridge/services/dbg.c b/drivers/dsp/bridge/services/dbg.c
index a70297d..86c4628 100644
--- a/drivers/dsp/bridge/services/dbg.c
+++ b/drivers/dsp/bridge/services/dbg.c
@@ -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;
diff --git a/drivers/dsp/bridge/services/mem.c b/drivers/dsp/bridge/services/mem.c
index 092b532..9eb50e5 100644
--- a/drivers/dsp/bridge/services/mem.c
+++ b/drivers/dsp/bridge/services/mem.c
@@ -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;
}
diff --git a/drivers/dsp/bridge/services/ntfy.c b/drivers/dsp/bridge/services/ntfy.c
index a0abd56..4908be1 100644
--- a/drivers/dsp/bridge/services/ntfy.c
+++ b/drivers/dsp/bridge/services/ntfy.c
@@ -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;
}
diff --git a/drivers/dsp/bridge/services/reg.c b/drivers/dsp/bridge/services/reg.c
index 36c1519..2e87982 100644
--- a/drivers/dsp/bridge/services/reg.c
+++ b/drivers/dsp/bridge/services/reg.c
@@ -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(®_debugMask, "RG"); /* RG for ReG */
-
fInit = regsupInit();
return fInit;
diff --git a/drivers/dsp/bridge/services/regsup.c b/drivers/dsp/bridge/services/regsup.c
index 04f6b3a..fc625f4 100644
--- a/drivers/dsp/bridge/services/regsup.c
+++ b/drivers/dsp/bridge/services/regsup.c
@@ -45,10 +45,6 @@ struct RegValue {
/* Pointer to the registry support key */
static struct LST_LIST regKey, *pRegKey = ®Key;
-#if GT_TRACE
-extern struct GT_Mask REG_debugMask; /* GT trace var. */
-#endif
-
/*
* ======== regsupInit ========
* Purpose:
diff --git a/drivers/dsp/bridge/services/services.c b/drivers/dsp/bridge/services/services.c
index 8a30ac6..87bb76b 100644
--- a/drivers/dsp/bridge/services/services.c
+++ b/drivers/dsp/bridge/services/services.c
@@ -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();
diff --git a/drivers/dsp/bridge/services/sync.c b/drivers/dsp/bridge/services/sync.c
index f9cd360..f9cac58 100644
--- a/drivers/dsp/bridge/services/sync.c
+++ b/drivers/dsp/bridge/services/sync.c
@@ -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;
}
--
1.6.2.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 10/12] DSPBRIDGE: Remove custom debugging implementation
2010-02-18 21:38 ` [PATCH 09/12] DSPBRIDGE: Remove GT_trace variables for services Omar Ramirez Luna
@ 2010-02-18 21:38 ` Omar Ramirez Luna
2010-02-18 21:38 ` [PATCH 11/12] DSPBRIDGE: Remove debug header files Omar Ramirez Luna
0 siblings, 1 reply; 14+ messages in thread
From: Omar Ramirez Luna @ 2010-02-18 21:38 UTC (permalink / raw)
To: linux-omap
Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
Omar Ramirez Luna
Replace custom debug implementation with a friendly set
of pr_err, pr_info and dev_dbg messages.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
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
diff --git a/arch/arm/plat-omap/include/dspbridge/dbg.h b/arch/arm/plat-omap/include/dspbridge/dbg.h
index 4d01eca..828fd71 100644
--- a/arch/arm/plat-omap/include/dspbridge/dbg.h
+++ b/arch/arm/plat-omap/include/dspbridge/dbg.h
@@ -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_ */
diff --git a/arch/arm/plat-omap/include/dspbridge/gt.h b/arch/arm/plat-omap/include/dspbridge/gt.h
index 9097910..116bb6f 100644
--- a/arch/arm/plat-omap/include/dspbridge/gt.h
+++ b/arch/arm/plat-omap/include/dspbridge/gt.h
@@ -34,275 +34,4 @@
#include <dspbridge/host_os.h>
-#if !defined(GT_ASSERT) || GT_TRACE
-#define GT_ASSERT 1
-#endif
-
-struct GT_Config {
- Fxn PRINTFXN;
- Fxn PIDFXN;
- Fxn TIDFXN;
- Fxn ERRORFXN;
-};
-
-extern struct GT_Config *GT;
-
-struct GT_Mask {
- char *modName;
- u8 *flags;
-} ;
-
-/*
- * New GT Class defenitions.
- *
- * The following are the explanations and how it could be used in the code
- *
- * - GT_ENTER On Entry to Functions
- *
- * - GT_1CLASS Display level of debugging status- Object/Automatic
- * variables
- * - GT_2CLASS ---- do ----
- *
- * - GT_3CLASS ---- do ---- + It can be used(recommended) for debug
- * status in the ISR, IST
- * - GT_4CLASS ---- do ----
- *
- * - GT_5CLASS Display entry for module init/exit functions
- *
- * - GT_6CLASS Warn whenever SERVICES function fails
- *
- * - GT_7CLASS Warn failure of Critical failures
- *
- */
-
-#define GT_ENTER ((u8)0x01)
-#define GT_1CLASS ((u8)0x02)
-#define GT_2CLASS ((u8)0x04)
-#define GT_3CLASS ((u8)0x08)
-#define GT_4CLASS ((u8)0x10)
-#define GT_5CLASS ((u8)0x20)
-#define GT_6CLASS ((u8)0x40)
-#define GT_7CLASS ((u8)0x80)
-
-#ifdef _LINT_
-
-/* LINTLIBRARY */
-
-/*
- * ======== GT_assert ========
- */
-/* ARGSUSED */
-void GT_assert(struct GT_Mask mask, s32 expr)
-{
-}
-
-/*
- * ======== GT_config ========
- */
-/* ARGSUSED */
-void GT_config(struct GT_Config config)
-{
-}
-
-/*
- * ======== GT_create ========
- */
-/* ARGSUSED */
-void GT_create(struct GT_Mask *mask, char *modName)
-{
-}
-
-/*
- * ======== GT_curLine ========
- * Purpose:
- * Returns the current source code line number. Is useful for performing
- * branch testing using trace. For example,
- *
- * GT_1trace(curTrace, GT_1CLASS,
- * "in module XX_mod, executing line %u\n", GT_curLine());
- */
-/* ARGSUSED */
-u16 GT_curLine(void)
-{
- return (u16)NULL;
-}
-
-/*
- * ======== GT_exit ========
- */
-/* ARGSUSED */
-void GT_exit(void)
-{
-}
-
-/*
- * ======== GT_init ========
- */
-/* ARGSUSED */
-void GT_init(void)
-{
-}
-
-/*
- * ======== GT_query ========
- */
-/* ARGSUSED */
-bool GT_query(struct GT_Mask mask, u8 class)
-{
- return false;
-}
-
-/*
- * ======== GT_set ========
- * sets trace mask according to settings
- */
-
-/* ARGSUSED */
-void GT_set(char *settings)
-{
-}
-
-/*
- * ======== GT_setprintf ========
- * sets printf function
- */
-
-/* ARGSUSED */
-void GT_setprintf(Fxn fxn)
-{
-}
-
-/* ARGSUSED */
-void GT_0trace(struct GT_Mask mask, u8 class, char *format)
-{
-}
-
-/* ARGSUSED */
-void GT_1trace(struct GT_Mask mask, u8 class, char *format, ...)
-{
-}
-
-/* ARGSUSED */
-void GT_2trace(struct GT_Mask mask, u8 class, char *format, ...)
-{
-}
-
-/* ARGSUSED */
-void GT_3trace(struct GT_Mask mask, u8 class, char *format, ...)
-{
-}
-
-/* ARGSUSED */
-void GT_4trace(struct GT_Mask mask, u8 class, char *format, ...)
-{
-}
-
-/* ARGSUSED */
-void GT_5trace(struct GT_Mask mask, u8 class, char *format, ...)
-{
-}
-
-/* ARGSUSED */
-void GT_6trace(struct GT_Mask mask, u8 class, char *format, ...)
-{
-}
-
-#else
-
-#define GT_BOUND 26 /* 26 letters in alphabet */
-
-extern void _GT_create(struct GT_Mask *mask, char *modName);
-
-#define GT_exit()
-
-extern void GT_init(void);
-extern void _GT_set(char *str);
-extern s32 _GT_trace(struct GT_Mask *mask, char *format, ...);
-
-#if GT_ASSERT == 0
-
-#define GT_assert(mask, expr)
-#define GT_config(config)
-#define GT_configInit(config)
-#define GT_seterror(fxn)
-
-#else
-
-extern struct GT_Config _GT_params;
-
-#define GT_assert(mask, expr) \
- (!(expr) ? \
- pr_err("assertion violation: %s, line %d\n", \
- __FILE__, __LINE__), NULL : NULL)
-
-#define GT_config(config) (_GT_params = *(config))
-#define GT_configInit(config) (*(config) = _GT_params)
-#define GT_seterror(fxn) (_GT_params.ERRORFXN = (Fxn)(fxn))
-
-#endif
-
-#if GT_TRACE == 0
-
-#define GT_curLine() ((u16)__LINE__)
-#define GT_create(mask, modName)
-#define GT_exit()
-#define GT_init()
-#define GT_set(settings)
-#define GT_setprintf(fxn)
-
-#define GT_query(mask, class) false
-
-#define GT_0trace(mask, class, format) do {} while (0)
-#define GT_1trace(mask, class, format, arg1) do {} while (0)
-#define GT_2trace(mask, class, format, arg1, arg2) do {} while (0)
-#define GT_3trace(mask, class, format, arg1, arg2, arg3) do {} while (0)
-#define GT_4trace(mask, class, format, arg1, arg2, arg3, arg4) do {} while (0)
-#define GT_5trace(mask, class, format, arg1, arg2, arg3, arg4, arg5) \
- do {} while (0)
-#define GT_6trace(mask, class, format, arg1, arg2, arg3, arg4, arg5, arg6) \
- do {} while (0)
-
-#else /* GT_TRACE == 1 */
-
-
-#define GT_create(mask, modName) _GT_create((mask), (modName))
-#define GT_curLine() ((u16)__LINE__)
-#define GT_set(settings) _GT_set(settings)
-#define GT_setprintf(fxn) (_GT_params.PRINTFXN = (Fxn)(fxn))
-
-#define GT_query(mask, class) ((*(mask).flags & (class)))
-
-#define GT_0trace(mask, class, format) \
- ((*(mask).flags & (class)) ? \
- _GT_trace(&(mask), (format)) : 0)
-
-#define GT_1trace(mask, class, format, arg1) \
- ((*(mask).flags & (class)) ? \
- _GT_trace(&(mask), (format), (arg1)) : 0)
-
-#define GT_2trace(mask, class, format, arg1, arg2) \
- ((*(mask).flags & (class)) ? \
- _GT_trace(&(mask), (format), (arg1), (arg2)) : 0)
-
-#define GT_3trace(mask, class, format, arg1, arg2, arg3) \
- ((*(mask).flags & (class)) ? \
- _GT_trace(&(mask), (format), (arg1), (arg2), (arg3)) : 0)
-
-#define GT_4trace(mask, class, format, arg1, arg2, arg3, arg4) \
- ((*(mask).flags & (class)) ? \
- _GT_trace(&(mask), (format), (arg1), (arg2), (arg3), (arg4)) : 0)
-
-#define GT_5trace(mask, class, format, arg1, arg2, arg3, arg4, arg5) \
- ((*(mask).flags & (class)) ? \
- _GT_trace(&(mask), (format), (arg1), (arg2), (arg3), (arg4), (arg5)) : 0)
-
-#define GT_6trace(mask, class, format, arg1, arg2, arg3, arg4, arg5, arg6) \
- ((*(mask).flags & (class)) ? \
- _GT_trace(&(mask), (format), (arg1), (arg2), (arg3), (arg4), (arg5), \
- (arg6)) : 0)
-
-#endif /* GT_TRACE */
-
-#endif /* _LINT_ */
-
#endif /* GTCE_ */
diff --git a/drivers/dsp/bridge/Makefile b/drivers/dsp/bridge/Makefile
index 8aeb6a5..11d92cd 100644
--- a/drivers/dsp/bridge/Makefile
+++ b/drivers/dsp/bridge/Makefile
@@ -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
diff --git a/drivers/dsp/bridge/gen/_gt_para.c b/drivers/dsp/bridge/gen/_gt_para.c
deleted file mode 100644
index 1bb82b1..0000000
--- a/drivers/dsp/bridge/gen/_gt_para.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * _gt_para.c
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * Copyright (C) 2005-2006 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.
- */
-
-/*
- * Configuration parameters for GT. This file is separated from
- * gt.c so that GT_assert() can reference the error function without
- * forcing the linker to include all the code for GT_set(), GT_init(),
- * etc. into a fully bound image. Thus, GT_assert() can be retained in
- * a program for which GT_?trace() has been compiled out.
- */
-
-/* ----------------------------------- Host OS */
-#include <dspbridge/host_os.h>
-
-/* ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
-
-/* ----------------------------------- Trace & Debug */
-#include <dspbridge/gt.h>
-
-/* ----------------------------------- Function Prototypes */
-static void error(char *msg, ...);
-static s32 GT_nop(void);
-
-/* ----------------------------------- Defines, Data Structures, Typedefs */
-
-struct GT_Config _GT_params = {
- (Fxn) printk, /* printf */
- (Fxn) NULL, /* procid */
- (Fxn) GT_nop, /* taskid */
- (Fxn) error, /* error */
-};
-
-/* ----------------------------------- Globals */
-struct GT_Config *GT = &_GT_params;
-
-/*
- * ======== GT_nop ========
- */
-static s32 GT_nop(void)
-{
- return 0;
-}
-
-/*
- * ======== error ========
- * purpose:
- * Prints error onto the standard output.
- */
-static void error(char *fmt, ...)
-{
- s32 arg1, arg2, arg3, arg4, arg5, arg6;
-
- va_list va;
-
- va_start(va, fmt);
-
- arg1 = va_arg(va, s32);
- arg2 = va_arg(va, s32);
- arg3 = va_arg(va, s32);
- arg4 = va_arg(va, s32);
- arg5 = va_arg(va, s32);
- arg6 = va_arg(va, s32);
-
- va_end(va);
-
- pr_err("ERROR: ");
- printk(fmt, arg1, arg2, arg3, arg4, arg5, arg6);
-
-#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");
- } else {
- set_current_state(TASK_INTERRUPTIBLE);
- flush_signals(current);
- schedule();
- flush_signals(current);
- printk(KERN_INFO "Signaled in error function\n");
- }
-#endif
-}
diff --git a/drivers/dsp/bridge/gen/gt.c b/drivers/dsp/bridge/gen/gt.c
deleted file mode 100644
index 40bed53..0000000
--- a/drivers/dsp/bridge/gen/gt.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * gt.c
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * This module implements the trace mechanism for bridge.
- *
- * Copyright (C) 2005-2006 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.
- */
-
-/* ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
-
-/* ----------------------------------- This */
-#include <dspbridge/gt.h>
-
-#define GT_WILD '*'
-
-#define GT_CLEAR '='
-#define GT_ON '+'
-#define GT_OFF '-'
-
-enum GT_State {
- GT_SEP,
- GT_FIRST,
- GT_SECOND,
- GT_OP,
- GT_DIGITS
-} ;
-
-#ifdef CONFIG_BRIDGE_DEBUG
-static char *GT_1format = "%s - %d: ";
-static char *GT_2format = "%s - %d(%d): ";
-#endif /* CONFIG_BRIDGE_DEBUG */
-
-static unsigned char *GT_tMask[GT_BOUND];
-
-static bool curInit;
-static char *separator;
-static unsigned char tabMem[GT_BOUND][sizeof(unsigned char) * GT_BOUND];
-
-static void error(char *string);
-static void setMask(s16 index1, s16 index2, char op, unsigned char mask);
-
-/*
- * ======== _GT_create ========
- * purpose:
- * Creates GT mask.
- */
-void _GT_create(struct GT_Mask *mask, char *modName)
-{
- mask->modName = modName;
- mask->flags = &(GT_tMask[modName[0] - 'A'][modName[1] - 'A']);
-}
-
-/*
- * ======== GT_init ========
- * purpose:
- * Initializes GT module.
- */
-#ifdef GT_init
-#undef GT_init
-#endif
-void GT_init(void)
-{
- register unsigned char index1;
- register unsigned char index2;
-
- if (!curInit) {
- curInit = true;
-
- separator = " ,;/";
-
- for (index1 = 0; index1 < GT_BOUND; index1++) {
- GT_tMask[index1] = tabMem[index1];
- for (index2 = 0; index2 < GT_BOUND; index2++) {
- /* no tracing */
- GT_tMask[index1][index2] = 0x00;
- }
- }
- }
-}
-
-/*
- * ======== _GT_set ========
- * purpose:
- * Sets the trace string format.
- */
-
-void _GT_set(char *str)
-{
- enum GT_State state;
- char *sep;
- s16 index1 = GT_BOUND; /* indicates all values */
- s16 index2 = GT_BOUND; /* indicates all values */
- char op = GT_CLEAR;
- bool maskValid;
- s16 digit;
- register unsigned char mask = 0x0; /* no tracing */
-
- if (str == NULL)
- return;
-
- maskValid = false;
- state = GT_SEP;
- while (*str != '\0') {
- switch ((s32) state) {
- case (s32) GT_SEP:
- maskValid = false;
- sep = separator;
- while (*sep != '\0') {
- if (*str == *sep) {
- str++;
- break;
- } else {
- sep++;
- }
- }
- if (*sep == '\0')
- state = GT_FIRST;
-
- break;
- case (s32) GT_FIRST:
- if (*str == GT_WILD) {
- /* indicates all values */
- index1 = GT_BOUND;
- /* indicates all values */
- index2 = GT_BOUND;
- state = GT_OP;
- } else {
- if (*str >= 'a')
- index1 = (s16) (*str - 'a');
- else
- index1 = (s16) (*str - 'A');
- if ((index1 >= 0) && (index1 < GT_BOUND))
- state = GT_SECOND;
- else
- state = GT_SEP;
- }
- str++;
- break;
- case (s32) GT_SECOND:
- if (*str == GT_WILD) {
- index2 = GT_BOUND; /* indicates all values */
- state = GT_OP;
- str++;
- } else {
- if (*str >= 'a')
- index2 = (s16) (*str - 'a');
- else
- index2 = (s16) (*str - 'A');
- if ((index2 >= 0) && (index2 < GT_BOUND)) {
- state = GT_OP;
- str++;
- } else {
- state = GT_SEP;
- }
- }
- break;
- case (s32) GT_OP:
- op = *str;
- mask = 0x0; /* no tracing */
- switch (op) {
- case (s32) GT_CLEAR:
- maskValid = true;
- case (s32) GT_ON:
- case (s32) GT_OFF:
- state = GT_DIGITS;
- str++;
- break;
- default:
- state = GT_SEP;
- break;
- }
- break;
- case (s32) GT_DIGITS:
- digit = (s16) (*str - '0');
- if ((digit >= 0) && (digit <= 7)) {
- mask |= (0x01 << digit);
- maskValid = true;
- str++;
- } else {
- if (maskValid == true) {
- setMask(index1, index2, op, mask);
- maskValid = false;
- }
- state = GT_SEP;
- }
- break;
- default:
- error("illegal trace mask");
- break;
- }
- }
-
- if (maskValid)
- setMask(index1, index2, op, mask);
-}
-
-/*
- * ======== _GT_trace ========
- * purpose:
- * Prints the input string onto standard output
- */
-
-s32 _GT_trace(struct GT_Mask *mask, char *format, ...)
-{
- s32 arg1, arg2, arg3, arg4, arg5, arg6;
- va_list va;
-
- va_start(va, format);
-
- arg1 = va_arg(va, s32);
- arg2 = va_arg(va, s32);
- arg3 = va_arg(va, s32);
- arg4 = va_arg(va, s32);
- arg5 = va_arg(va, s32);
- arg6 = va_arg(va, s32);
-
- va_end(va);
-#ifdef CONFIG_BRIDGE_DEBUG
- if (GT->PIDFXN == NULL) {
- printk(GT_1format, mask->modName, GT->TIDFXN ?
- (*GT->TIDFXN)() : 0);
- } else {
- printk(GT_2format, mask->modName, (*GT->PIDFXN)(),
- GT->TIDFXN ? (*GT->TIDFXN)() : 0);
- }
-#endif
- printk(format, arg1, arg2, arg3, arg4, arg5, arg6);
-
- return 0;
-}
-
-/*
- * ======== error ========
- * purpose:
- * Prints errors onto the standard output.
- */
-static void error(char *string)
-{
- printk("GT: %s", string);
-}
-
-/*
- * ======== setmask ========
- * purpose:
- * Sets mask for the GT module.
- */
-
-static void setMask(s16 index1, s16 index2, char op, u8 mask)
-{
- register s16 index;
-
- if (index1 < GT_BOUND) {
- if (index2 < GT_BOUND) {
- switch (op) {
- case (s32) GT_CLEAR:
- GT_tMask[index1][index2] = mask;
- break;
- case (s32) GT_ON:
- GT_tMask[index1][index2] |= mask;
- break;
- case (s32) GT_OFF:
- GT_tMask[index1][index2] &= ~mask;
- break;
- default:
- error("illegal trace mask");
- break;
- }
- } else {
- for (index2--; index2 >= 0; index2--) {
- switch (op) {
- case (s32) GT_CLEAR:
- GT_tMask[index1][index2] = mask;
- break;
- case (s32) GT_ON:
- GT_tMask[index1][index2] |= mask;
- break;
- case (s32) GT_OFF:
- GT_tMask[index1][index2] &= ~mask;
- break;
- default:
- error("illegal trace mask");
- break;
- }
- }
- }
- } else {
- for (index1--; index1 >= 0; index1--) {
- if (index2 < GT_BOUND) {
- switch (op) {
- case (s32) GT_CLEAR:
- GT_tMask[index1][index2] = mask;
- break;
- case (s32) GT_ON:
- GT_tMask[index1][index2] |= mask;
- break;
- case (s32) GT_OFF:
- GT_tMask[index1][index2] &= ~mask;
- break;
- default:
- error("illegal trace mask");
- break;
- }
- } else {
- index = GT_BOUND;
- for (index--; index >= 0; index--) {
- switch (op) {
- case (s32) GT_CLEAR:
- GT_tMask[index1][index] = mask;
- break;
- case (s32) GT_ON:
- GT_tMask[index1][index] |= mask;
- break;
- case (s32) GT_OFF:
- GT_tMask[index1][index] &=
- ~mask;
- break;
- default:
- error("illegal trace mask");
- break;
- }
- }
- }
- }
- }
-}
diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index 24246d5..1d09bb5 100644
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -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);
diff --git a/drivers/dsp/bridge/services/dbg.c b/drivers/dsp/bridge/services/dbg.c
deleted file mode 100644
index 86c4628..0000000
--- a/drivers/dsp/bridge/services/dbg.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * dbg.c
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * Provide debugging services for DSP/BIOS Bridge Mini Driver.
- *
- * Copyright (C) 2005-2006 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.
- */
-
-/* ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
-#include <dspbridge/dbdefs.h>
-#include <dspbridge/errbase.h>
-
-/* ----------------------------------- Trace & Debug */
-#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
-
-/* ----------------------------------- This */
-#include <dspbridge/dbg.h>
-
-#if (defined(CONFIG_BRIDGE_DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE
-
-/*
- * ======== DBG_Init ========
- * Purpose:
- * Ensures trace capability is set up for link drivers.
- */
-bool DBG_Init(void)
-{
- return true;
-}
-
-/*
- * ======== DBG_Trace ========
- * Purpose:
- * Output a trace message to the debugger, if the given trace level
- * is unmasked.
- */
-DSP_STATUS DBG_Trace(u8 bLevel, char *pstrFormat, ...)
-{
- s32 arg1, arg2, arg3, arg4, arg5, arg6;
- va_list va;
-
- va_start(va, pstrFormat);
-
- arg1 = va_arg(va, s32);
- arg2 = va_arg(va, s32);
- arg3 = va_arg(va, s32);
- arg4 = va_arg(va, s32);
- arg5 = va_arg(va, s32);
- arg6 = va_arg(va, s32);
-
- va_end(va);
-
- if (bLevel)
- printk(pstrFormat, arg1, arg2, arg3, arg4, arg5, arg6);
-
- return DSP_SOK;
-}
-
-/*
- * ======== DBG_Exit ========
- * Purpose:
- * Discontinue usage of the DBG module.
- */
-void DBG_Exit(void)
-{
- /* Do nothing */
-}
-
-#endif /* (CONFIG_BRIDGE_DEBUG || DDSP_DEBUG_PRODUCT) && GT_TRACE */
diff --git a/drivers/dsp/bridge/services/services.c b/drivers/dsp/bridge/services/services.c
index 87bb76b..f1a8fa8 100644
--- a/drivers/dsp/bridge/services/services.c
+++ b/drivers/dsp/bridge/services/services.c
@@ -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();
--
1.6.2.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 11/12] DSPBRIDGE: Remove debug header files
2010-02-18 21:38 ` [PATCH 10/12] DSPBRIDGE: Remove custom debugging implementation Omar Ramirez Luna
@ 2010-02-18 21:38 ` Omar Ramirez Luna
2010-02-18 21:38 ` [PATCH 12/12] DSPBRIDGE: Remove unused instances of CONFIG_BRIDGE_DEBUG Omar Ramirez Luna
0 siblings, 1 reply; 14+ messages in thread
From: Omar Ramirez Luna @ 2010-02-18 21:38 UTC (permalink / raw)
To: linux-omap
Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
Omar Ramirez Luna
This patch removes header files used in bridge debug
implementation.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
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
diff --git a/arch/arm/plat-omap/include/dspbridge/dbc.h b/arch/arm/plat-omap/include/dspbridge/dbc.h
index 1b3ac44..c4bf803 100644
--- a/arch/arm/plat-omap/include/dspbridge/dbc.h
+++ b/arch/arm/plat-omap/include/dspbridge/dbc.h
@@ -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", \
diff --git a/arch/arm/plat-omap/include/dspbridge/dbg.h b/arch/arm/plat-omap/include/dspbridge/dbg.h
deleted file mode 100644
index 828fd71..0000000
--- a/arch/arm/plat-omap/include/dspbridge/dbg.h
+++ /dev/null
@@ -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_ */
diff --git a/arch/arm/plat-omap/include/dspbridge/gt.h b/arch/arm/plat-omap/include/dspbridge/gt.h
deleted file mode 100644
index 116bb6f..0000000
--- a/arch/arm/plat-omap/include/dspbridge/gt.h
+++ /dev/null
@@ -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_ */
diff --git a/drivers/dsp/bridge/pmgr/chnl.c b/drivers/dsp/bridge/pmgr/chnl.c
index cfece9c..6331b97 100644
--- a/drivers/dsp/bridge/pmgr/chnl.c
+++ b/drivers/dsp/bridge/pmgr/chnl.c
@@ -27,7 +27,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/cfg.h>
diff --git a/drivers/dsp/bridge/pmgr/cmm.c b/drivers/dsp/bridge/pmgr/cmm.c
index e8fed86..0cd50b1 100644
--- a/drivers/dsp/bridge/pmgr/cmm.c
+++ b/drivers/dsp/bridge/pmgr/cmm.c
@@ -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>
diff --git a/drivers/dsp/bridge/pmgr/cod.c b/drivers/dsp/bridge/pmgr/cod.c
index 9552618..1b535fd 100644
--- a/drivers/dsp/bridge/pmgr/cod.c
+++ b/drivers/dsp/bridge/pmgr/cod.c
@@ -32,7 +32,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/ldr.h>
diff --git a/drivers/dsp/bridge/pmgr/dbll.c b/drivers/dsp/bridge/pmgr/dbll.c
index 0970974..904e03d 100644
--- a/drivers/dsp/bridge/pmgr/dbll.c
+++ b/drivers/dsp/bridge/pmgr/dbll.c
@@ -23,7 +23,6 @@
#include <dspbridge/errbase.h>
/* ----------------------------------- Trace & Debug */
-#include <dspbridge/gt.h>
#include <dspbridge/dbc.h>
#include <dspbridge/gh.h>
diff --git a/drivers/dsp/bridge/pmgr/dev.c b/drivers/dsp/bridge/pmgr/dev.c
index 20faf87..42c5c6a 100644
--- a/drivers/dsp/bridge/pmgr/dev.c
+++ b/drivers/dsp/bridge/pmgr/dev.c
@@ -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>
diff --git a/drivers/dsp/bridge/pmgr/dmm.c b/drivers/dsp/bridge/pmgr/dmm.c
index 9a1c6b0..b0d5d5c 100644
--- a/drivers/dsp/bridge/pmgr/dmm.c
+++ b/drivers/dsp/bridge/pmgr/dmm.c
@@ -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>
diff --git a/drivers/dsp/bridge/pmgr/io.c b/drivers/dsp/bridge/pmgr/io.c
index 846562a..701d047 100644
--- a/drivers/dsp/bridge/pmgr/io.c
+++ b/drivers/dsp/bridge/pmgr/io.c
@@ -26,7 +26,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/cfg.h>
diff --git a/drivers/dsp/bridge/pmgr/msg.c b/drivers/dsp/bridge/pmgr/msg.c
index b7f3fc4..0f40051 100644
--- a/drivers/dsp/bridge/pmgr/msg.c
+++ b/drivers/dsp/bridge/pmgr/msg.c
@@ -26,7 +26,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/mem.h>
diff --git a/drivers/dsp/bridge/pmgr/wcd.c b/drivers/dsp/bridge/pmgr/wcd.c
index 20a2b04..08728d1 100644
--- a/drivers/dsp/bridge/pmgr/wcd.c
+++ b/drivers/dsp/bridge/pmgr/wcd.c
@@ -27,7 +27,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/cfg.h>
diff --git a/drivers/dsp/bridge/rmgr/dbdcd.c b/drivers/dsp/bridge/rmgr/dbdcd.c
index 9fd05a0..0fcf9cc 100644
--- a/drivers/dsp/bridge/rmgr/dbdcd.c
+++ b/drivers/dsp/bridge/rmgr/dbdcd.c
@@ -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>
diff --git a/drivers/dsp/bridge/rmgr/disp.c b/drivers/dsp/bridge/rmgr/disp.c
index 6ae3bcb..645f233 100644
--- a/drivers/dsp/bridge/rmgr/disp.c
+++ b/drivers/dsp/bridge/rmgr/disp.c
@@ -26,7 +26,6 @@
#include <dspbridge/errbase.h>
/* ----------------------------------- Trace & Debug */
-#include <dspbridge/gt.h>
#include <dspbridge/dbc.h>
/* ----------------------------------- OS Adaptation Layer */
diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c
index 177d676..f323c8f 100644
--- a/drivers/dsp/bridge/rmgr/drv.c
+++ b/drivers/dsp/bridge/rmgr/drv.c
@@ -26,7 +26,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/cfg.h>
diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index 1d09bb5..74478dd 100644
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -37,7 +37,6 @@
#include <dspbridge/errbase.h>
/* ----------------------------------- Trace & Debug */
-#include <dspbridge/gt.h>
#include <dspbridge/dbc.h>
/* ----------------------------------- OS Adaptation Layer */
diff --git a/drivers/dsp/bridge/rmgr/dspdrv.c b/drivers/dsp/bridge/rmgr/dspdrv.c
index 0fdb150..cc965c4 100644
--- a/drivers/dsp/bridge/rmgr/dspdrv.c
+++ b/drivers/dsp/bridge/rmgr/dspdrv.c
@@ -26,7 +26,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/cfg.h>
diff --git a/drivers/dsp/bridge/rmgr/mgr.c b/drivers/dsp/bridge/rmgr/mgr.c
index e63aaa1..cf015a4 100644
--- a/drivers/dsp/bridge/rmgr/mgr.c
+++ b/drivers/dsp/bridge/rmgr/mgr.c
@@ -25,7 +25,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/cfg.h>
diff --git a/drivers/dsp/bridge/rmgr/nldr.c b/drivers/dsp/bridge/rmgr/nldr.c
index 5c1266d..9e9dfc8 100644
--- a/drivers/dsp/bridge/rmgr/nldr.c
+++ b/drivers/dsp/bridge/rmgr/nldr.c
@@ -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>
diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c
index cb3d324..4eb6582 100644
--- a/drivers/dsp/bridge/rmgr/node.c
+++ b/drivers/dsp/bridge/rmgr/node.c
@@ -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 */
diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
index 8489cd3..c5f4577 100644
--- a/drivers/dsp/bridge/rmgr/proc.c
+++ b/drivers/dsp/bridge/rmgr/proc.c
@@ -26,7 +26,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/cfg.h>
diff --git a/drivers/dsp/bridge/rmgr/rmm.c b/drivers/dsp/bridge/rmgr/rmm.c
index 188faba..506bc57 100644
--- a/drivers/dsp/bridge/rmgr/rmm.c
+++ b/drivers/dsp/bridge/rmgr/rmm.c
@@ -44,7 +44,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/list.h>
diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c
index 6b62e41..63319ee 100644
--- a/drivers/dsp/bridge/rmgr/strm.c
+++ b/drivers/dsp/bridge/rmgr/strm.c
@@ -26,7 +26,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/mem.h>
diff --git a/drivers/dsp/bridge/services/cfg.c b/drivers/dsp/bridge/services/cfg.c
index 19c296e..1b7e0ea 100644
--- a/drivers/dsp/bridge/services/cfg.c
+++ b/drivers/dsp/bridge/services/cfg.c
@@ -23,7 +23,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/reg.h>
diff --git a/drivers/dsp/bridge/services/clk.c b/drivers/dsp/bridge/services/clk.c
index d279036..4ef4290 100644
--- a/drivers/dsp/bridge/services/clk.c
+++ b/drivers/dsp/bridge/services/clk.c
@@ -26,7 +26,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/mem.h>
diff --git a/drivers/dsp/bridge/services/mem.c b/drivers/dsp/bridge/services/mem.c
index 9eb50e5..740377f 100644
--- a/drivers/dsp/bridge/services/mem.c
+++ b/drivers/dsp/bridge/services/mem.c
@@ -26,7 +26,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- This */
#include <dspbridge/mem.h>
diff --git a/drivers/dsp/bridge/services/ntfy.c b/drivers/dsp/bridge/services/ntfy.c
index 4908be1..4e73c5f 100644
--- a/drivers/dsp/bridge/services/ntfy.c
+++ b/drivers/dsp/bridge/services/ntfy.c
@@ -26,7 +26,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/list.h>
diff --git a/drivers/dsp/bridge/services/reg.c b/drivers/dsp/bridge/services/reg.c
index 2e87982..2187aed 100644
--- a/drivers/dsp/bridge/services/reg.c
+++ b/drivers/dsp/bridge/services/reg.c
@@ -26,7 +26,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/mem.h>
diff --git a/drivers/dsp/bridge/services/regsup.c b/drivers/dsp/bridge/services/regsup.c
index fc625f4..8df6fec 100644
--- a/drivers/dsp/bridge/services/regsup.c
+++ b/drivers/dsp/bridge/services/regsup.c
@@ -26,7 +26,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/mem.h>
diff --git a/drivers/dsp/bridge/services/services.c b/drivers/dsp/bridge/services/services.c
index f1a8fa8..dac0b39 100644
--- a/drivers/dsp/bridge/services/services.c
+++ b/drivers/dsp/bridge/services/services.c
@@ -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>
diff --git a/drivers/dsp/bridge/services/sync.c b/drivers/dsp/bridge/services/sync.c
index f9cac58..bd07938 100644
--- a/drivers/dsp/bridge/services/sync.c
+++ b/drivers/dsp/bridge/services/sync.c
@@ -26,7 +26,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/gt.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/mem.h>
diff --git a/drivers/dsp/bridge/wmd/chnl_sm.c b/drivers/dsp/bridge/wmd/chnl_sm.c
index e681303..3696fad 100644
--- a/drivers/dsp/bridge/wmd/chnl_sm.c
+++ b/drivers/dsp/bridge/wmd/chnl_sm.c
@@ -52,7 +52,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/dbg.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/mem.h>
diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c
index 967fb17..e863478 100644
--- a/drivers/dsp/bridge/wmd/io_sm.c
+++ b/drivers/dsp/bridge/wmd/io_sm.c
@@ -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
diff --git a/drivers/dsp/bridge/wmd/mmu_fault.c b/drivers/dsp/bridge/wmd/mmu_fault.c
index 1a9137d..8cac1ef 100644
--- a/drivers/dsp/bridge/wmd/mmu_fault.c
+++ b/drivers/dsp/bridge/wmd/mmu_fault.c
@@ -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>
diff --git a/drivers/dsp/bridge/wmd/tiomap3430.c b/drivers/dsp/bridge/wmd/tiomap3430.c
index c91f919..b19d479 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430.c
@@ -33,7 +33,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/dbg.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/mem.h>
diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
index bdff0a7..16e786a 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
@@ -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>
diff --git a/drivers/dsp/bridge/wmd/tiomap_io.c b/drivers/dsp/bridge/wmd/tiomap_io.c
index d11d605..d107a3c 100644
--- a/drivers/dsp/bridge/wmd/tiomap_io.c
+++ b/drivers/dsp/bridge/wmd/tiomap_io.c
@@ -22,7 +22,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/dbg.h>
/* ----------------------------------- Platform Manager */
#include <dspbridge/dev.h>
diff --git a/drivers/dsp/bridge/wmd/tiomap_sm.c b/drivers/dsp/bridge/wmd/tiomap_sm.c
index 3fa24cd..ed18fdd 100644
--- a/drivers/dsp/bridge/wmd/tiomap_sm.c
+++ b/drivers/dsp/bridge/wmd/tiomap_sm.c
@@ -21,8 +21,6 @@
#include <dspbridge/drv.h>
#include <dspbridge/dev.h>
-#include <dspbridge/dbg.h>
-
#include "_tiomap.h"
#include "_tiomap_pwr.h"
diff --git a/drivers/dsp/bridge/wmd/ue_deh.c b/drivers/dsp/bridge/wmd/ue_deh.c
index 618d6e2..5c69f7e 100644
--- a/drivers/dsp/bridge/wmd/ue_deh.c
+++ b/drivers/dsp/bridge/wmd/ue_deh.c
@@ -26,7 +26,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-#include <dspbridge/dbg.h>
/* ----------------------------------- OS Adaptation Layer */
#include <dspbridge/cfg.h>
--
1.6.2.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 12/12] DSPBRIDGE: Remove unused instances of CONFIG_BRIDGE_DEBUG
2010-02-18 21:38 ` [PATCH 11/12] DSPBRIDGE: Remove debug header files Omar Ramirez Luna
@ 2010-02-18 21:38 ` Omar Ramirez Luna
0 siblings, 0 replies; 14+ messages in thread
From: Omar Ramirez Luna @ 2010-02-18 21:38 UTC (permalink / raw)
To: linux-omap
Cc: Ameya Palande, Hiroshi Doyu, Felipe Contreras, Nishanth Menon,
Omar Ramirez Luna
Remove unused instances of CONFIG_BRIDGE_DEBUG.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
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(-)
diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index 74478dd..373a33c 100644
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -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");
diff --git a/drivers/dsp/bridge/rmgr/nldr.c b/drivers/dsp/bridge/rmgr/nldr.c
index 9e9dfc8..481a1bc 100644
--- a/drivers/dsp/bridge/rmgr/nldr.c
+++ b/drivers/dsp/bridge/rmgr/nldr.c
@@ -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
}
}
}
diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c
index 4eb6582..f4bb675 100644
--- a/drivers/dsp/bridge/rmgr/node.c
+++ b/drivers/dsp/bridge/rmgr/node.c
@@ -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
}
}
diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
index c5f4577..38d6640 100644
--- a/drivers/dsp/bridge/rmgr/proc.c
+++ b/drivers/dsp/bridge/rmgr/proc.c
@@ -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;
}
diff --git a/drivers/dsp/bridge/services/cfg.c b/drivers/dsp/bridge/services/cfg.c
index 1b7e0ea..4f8896a 100644
--- a/drivers/dsp/bridge/services/cfg.c
+++ b/drivers/dsp/bridge/services/cfg.c
@@ -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;
}
diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c
index e863478..46d5d8f 100644
--- a/drivers/dsp/bridge/wmd/io_sm.c
+++ b/drivers/dsp/bridge/wmd/io_sm.c
@@ -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;
}
diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
index 16e786a..9abe545 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
@@ -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 */
--
1.6.2.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 00/12] Custom debug removal
2010-02-18 21:37 [PATCH 00/12] Custom debug removal Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 01/12] DSPBRIDGE: global bridge device Omar Ramirez Luna
@ 2010-02-23 18:09 ` Omar Ramirez Luna
1 sibling, 0 replies; 14+ messages in thread
From: Omar Ramirez Luna @ 2010-02-23 18:09 UTC (permalink / raw)
To: Ramirez Luna, Omar
Cc: linux-omap, Ameya Palande, Hiroshi Doyu, Felipe Contreras,
Menon, Nishanth
On 2/18/2010 3:37 PM, Ramirez Luna, Omar wrote:
> 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
>
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
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2010-02-23 18:09 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-18 21:37 [PATCH 00/12] Custom debug removal Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 01/12] DSPBRIDGE: global bridge device Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 02/12] DSPBRIDGE: Change custom GT_trace for dev_dbg Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 03/12] DSPBRIDGE: Change custom GT_trace for dev_dbg in wmd Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 04/12] DSPBRIDGE: Change custom GT_trace for dev_dbg in pmgr Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 05/12] DSPBRIDGE: Change custom GT_trace for dev_dbg in services Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 06/12] DSPBRIDGE: Remove GT_trace variables for rmgr Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 07/12] DSPBRIDGE: Remove GT_trace variables for wmd Omar Ramirez Luna
2010-02-18 21:37 ` [PATCH 08/12] DSPBRIDGE: Remove GT_trace variables for pmgr Omar Ramirez Luna
2010-02-18 21:38 ` [PATCH 09/12] DSPBRIDGE: Remove GT_trace variables for services Omar Ramirez Luna
2010-02-18 21:38 ` [PATCH 10/12] DSPBRIDGE: Remove custom debugging implementation Omar Ramirez Luna
2010-02-18 21:38 ` [PATCH 11/12] DSPBRIDGE: Remove debug header files Omar Ramirez Luna
2010-02-18 21:38 ` [PATCH 12/12] DSPBRIDGE: Remove unused instances of CONFIG_BRIDGE_DEBUG Omar Ramirez Luna
2010-02-23 18:09 ` [PATCH 00/12] Custom debug removal Omar Ramirez Luna
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox