dspbridge rfc: get rid of services/list.c (rebased)
Subsystems (2)
Hello.
Here are a few patches which change driver's own circular linked list implementation to native one in linux kernel. The initial idea was come from Hiroshi Doyu.
This version includes corrections which I got from Imre and Felipe. Additionally the fourth patch changes LST_ELEM name to native list_head in whole dsp bridge driver.
All patches are rebased against android-bridge-2.6.29 kernel branch of the kernel-dspbridge repository.
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH 1/4 DSPBRIDGE: Get rid of services/list.c
From: Andy Shevchenko <[email protected]>
* Remove LST_Init() and LST_Exit() calls because they are doing nothing except tracing, Thus, remove tracing as well.
* Remove DBC_* calls. It's internal kernel business whether to have those assertions.
* Switch to list_head structure instead of LST_ELEM. Remove redudant code that uses head->self pointer.
* Use native list methods where it's possible in the list.c.
--- arch/arm/plat-omap/include/dspbridge/list.h | 43 +------------ drivers/dsp/bridge/services/list.c | 89 ++------------------------- drivers/dsp/bridge/services/mem.c | 2 - drivers/dsp/bridge/services/services.c | 9 +-- 4 files changed, 10 insertions(+), 133 deletions(-)
arch/arm/plat-omap/include/dspbridge/list.h +3 -40
@@ -24,11 +24,9 @@* Public Functions: * LST_Create * LST_Delete -* LST_Exit * LST_First * LST_GetHead * LST_InitElem -* LST_Init * LST_InsertBefore * LST_IsEmpty * LST_Next
@@ -51,14 +49,10 @@#define LIST_ #include <dspbridge/host_os.h> +#include <linux/list.h> -#define LST_IsEmpty (l) (((l)->head.next == &(l)->head)) - -struct LST_ELEM { -struct LST_ELEM *next; -struct LST_ELEM *prev; -struct LST_ELEM *self; - } ; +#define LST_ELEM list_head +#define LST_IsEmpty (l) list_empty(&(l)->head)struct LST_LIST {struct LST_ELEM head;
@@ -111,20 +105,6 @@ extern void LST_Delete(IN struct LST_LIST *pList);/* -* ======== LST_Exit ======== -* Purpose: -* Discontinue usage of module; free resources when reference count -* reaches 0. -* Parameters: -* Returns: -* Requires: -* LST initialized. -* Ensures: -* Resources used by module are freed when cRef reaches zero. -*/ -extern void LST_Exit (void ); - -/* * ======== LST_First ======== * Purpose: * Returns a pointer to the first element of the list, or NULL if the list
@@ -160,7 +140,6 @@* Pointer to element that was at the head of the list (success) * NULL No elements in list * Requires: -* - head.self must be correctly set to &head. * - LST initialized. * - pList != NULL. * Ensures:
@@ -172,19 +151,6 @@ extern struct LST_ELEM *LST_GetHead(IN struct LST_LIST *pList);/* -* ======== LST_Init ======== -* Purpose: -* Initializes private state of LST module. -* Parameters: -* Returns: -* TRUE if initialized; FALSE otherwise. -* Requires: -* Ensures: -* LST initialized. -*/ -extern bool LST_Init (void ); - -/* * ======== LST_InitElem ======== * Purpose: * Initializes a list element to default (cleared) values
@@ -262,15 +228,12 @@* Void * Requires: * *pElem and *pList must both exist. -* pElem->self = pElem before pElem is passed to this function. * LST initialized. * Ensures: * Notes: * Because the tail is always "just before" the head of the list (the * tail's "next" pointer points at the head of the list, and the head's * "prev" pointer points at the tail of the list), the list is circular. -* Warning: if pElem->self is not set beforehand, LST_GetHead() will -* return an erroneous pointer when it is called for this element. */ extern void LST_PutTail(IN struct LST_LIST *pList, IN struct LST_ELEM *pListElem);
drivers/dsp/bridge/services/list.c +5 -84
187 lines not on this page · raw message
drivers/dsp/bridge/services/mem.c +0 -2
@@ -125,7 +125,6 @@ static inline void MLST_PutTail(struct LST_LIST *pList, struct LST_ELEM *pElem) pElem->next = &pList->head; pList->head.prev = pElem; pElem->prev->next = pElem; - pElem->self = pElem; } static inline void MLST_RemoveElem(struct LST_LIST *pList,
@@ -617,7 +616,6 @@ bool MEM_Init(void)#ifdef MEM_CHECK mMan.lst.head.next = &mMan.lst.head; mMan.lst.head.prev = &mMan.lst.head; - mMan.lst.head.self =NULL ;spin_lock_init (&mMan.lock);#endif
drivers/dsp/bridge/services/services.c +2 -7
@@ -85,7 +85,6 @@ void SERVICES_Exit(void)SYNC_Exit ();CLK_Exit ();REG_Exit (); -LST_Exit ();KFILE_Exit ();DPC_Exit ();DBG_Exit ();
@@ -107,7 +106,7 @@ void SERVICES_Exit(void)bool SERVICES_Init (void ) {bool fInit = true; -bool fCFG, fCSL, fDBG, fDPC, fKFILE, fLST, fMEM; +bool fCFG, fCSL, fDBG, fDPC, fKFILE, fMEM;bool fREG, fSYNC, fCLK, fNTFY;DBC_Require (cRefs >=0 );
@@ -128,13 +127,12 @@ bool SERVICES_Init(void) fDBG =DBG_Init (); fDPC =DPC_Init (); fKFILE =KFILE_Init (); - fLST =LST_Init (); fSYNC =SYNC_Init (); fCLK =CLK_Init (); fNTFY =NTFY_Init (); fInit = fCFG && fCSL && fDBG && fDPC && fKFILE && - fLST && fMEM && fREG && fSYNC && fCLK; + fMEM && fREG && fSYNC && fCLK;if (!fInit) {if (fNTFY)
@@ -149,9 +147,6 @@ bool SERVICES_Init(void)if (fREG)REG_Exit (); -if (fLST) -LST_Exit (); -if (fKFILE)KFILE_Exit ();
Signature · 1 line
1.5.6.5
PATCH 2/4 DSPBRIDGE: Get rid of services/list.c
From: Andy Shevchenko <[email protected]>
* Use native list_empty() method instead of LST_IsEmpty() inside list.c. Remove extra local variables.
* Move methods from list.c as inline functions in the list.h. Get rid of list.c at all.
* Use list_head natively instead of LST_ELEM in the list.h.
--- arch/arm/plat-omap/include/dspbridge/list.h | 90 ++++++++++--- drivers/dsp/bridge/Kbuild | 2 +- drivers/dsp/bridge/services/list.c | 200 --------------------------- 3 files changed, 74 insertions(+), 218 deletions(-) delete mode 100644 drivers/dsp/bridge/services/list.c
arch/arm/plat-omap/include/dspbridge/list.h +73 -17
@@ -49,14 +49,16 @@#define LIST_ #include <dspbridge/host_os.h> +/* MEM_Calloc(), MEM_NONPAGED, MEM_Free() */ +#include <dspbridge/mem.h> #include <linux/list.h> #define LST_ELEM list_head#define LST_IsEmpty (l) list_empty(&(l)->head) -struct LST_LIST { -struct LST_ELEM head; - } ; +struct LST_LIST { +struct list_head head; +};/* * ======== LST_Create ========
@@ -80,7 +82,17 @@* "empty" element, because its "next" and "prev" pointers point at * the same location (the element itself). */ -extern struct LST_LIST *LST_Create (void ); +static inline struct LST_LIST *LST_Create (void ) +{ +struct LST_LIST *pList; + + pList = (struct LST_LIST *)MEM_Calloc (sizeof (struct LST_LIST ), +MEM_NONPAGED ); +if (pList !=NULL ) +INIT_LIST_HEAD (&pList->head); + +return pList; +}/* * ======== LST_Delete ========
@@ -102,7 +114,11 @@* chain of list elements. Calling this function on a non-empty list * will cause a memory leak. */ - extern void LST_Delete(IN struct LST_LIST *pList); +static inline void LST_Delete (struct LST_LIST *pList) +{ +if (pList !=NULL ) +MEM_Free (pList); +}/* * ======== LST_First ========
@@ -118,7 +134,12 @@* - pList != NULL. * Ensures: */ - extern struct LST_ELEM *LST_First(IN struct LST_LIST *pList); +static inline struct list_head *LST_First (struct LST_LIST *pList) +{ +if (pList && !list_empty (&pList->head)) +return pList->head.next; +return NULL ; +}/* * ======== LST_GetHead ========
@@ -148,7 +169,19 @@* the head of the list, and the head of the list points backward (its * "prev" pointer) to the tail of the list, this list is circular. */ - extern struct LST_ELEM *LST_GetHead(IN struct LST_LIST *pList); +static inline struct list_head *LST_GetHead (struct LST_LIST *pList) +{ +struct list_head *pElem; + +if (!pList &&list_empty (&pList->head)) +return NULL ; + + pElem = pList->head.next; + pList->head.next = pElem->next; + pElem->next->prev = &pList->head; + +return pElem; +}/* * ======== LST_InitElem ========
@@ -166,7 +199,13 @@* of a list chain -- that would break the chain. * */ - extern void LST_InitElem(IN struct LST_ELEM *pListElem); +static inline void LST_InitElem (struct list_head *pElem) +{ +if (pElem) { + pElem->next =NULL ; + pElem->prev =NULL ; + } +}/* * ======== LST_InsertBefore ========
@@ -184,9 +223,13 @@* - pElemExisting != NULL. * Ensures: */ - extern void LST_InsertBefore(IN struct LST_LIST *pList, - IN struct LST_ELEM *pElem, - IN struct LST_ELEM *pElemExisting); +static inline void LST_InsertBefore (struct LST_LIST *pList, +struct list_head *pElem, +struct list_head *pElemExisting) +{ +if (pList && pElem && pElemExisting) +list_add_tail (pElem, pElemExisting); +}/* * ======== LST_Next ========
@@ -204,8 +247,14 @@* - pCurElem != NULL. * Ensures: */ - extern struct LST_ELEM *LST_Next(IN struct LST_LIST *pList, - IN struct LST_ELEM *pCurElem); +static inline struct list_head *LST_Next (struct LST_LIST *pList, +struct list_head *pCurElem) +{ +if (pList && !list_empty (&pList->head) && pCurElem && + (pCurElem->next != &pList->head)) +return pCurElem->next; +return NULL ; +}/* * ======== LST_PutTail ========
@@ -235,8 +284,11 @@* tail's "next" pointer points at the head of the list, and the head's * "prev" pointer points at the tail of the list), the list is circular. */ - extern void LST_PutTail(IN struct LST_LIST *pList, - IN struct LST_ELEM *pListElem); +static inline void LST_PutTail (struct LST_LIST *pList,struct list_head *pElem) +{ +if (pList && pElem) +list_add_tail (pElem, &pList->head); +}/* * ======== LST_RemoveElem ========
@@ -253,7 +305,11 @@* - pCurElem != NULL. * Ensures: */ -extern void LST_RemoveElem(IN struct LST_LIST *pList, - IN struct LST_ELEM *pCurElem); +static inline void LST_RemoveElem (struct LST_LIST *pList, +struct list_head *pCurElem) +{ +if (pList && !list_empty (&pList->head) && pCurElem) +list_del_init (pCurElem); +}#endif /* LIST_ */
drivers/dsp/bridge/Kbuild +1 -1
@@ -1,7 +1,7 @@ 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 -libservices = services/csl.o services/mem.o services/list.o services/dpc.o \ +libservices = services/csl.o services/mem.o services/dpc.o \ services/kfile.o services/sync.o \ services/clk.o services/cfg.o services/reg.o \ services/regsup.o services/ntfy.o \
drivers/dsp/bridge/services/list.c deleted +0 -200
200 lines not on this page · raw message
Signature · 1 line
1.5.6.5
PATCH 3/4 dspbridge: use linux memory allocator directly
From: Andy Shevchenko <[email protected]>
Instead of MEM_Calloc()/MEM_Free() use kzalloc()/kfree() calls. Thus we get rid of mem.h dependency.
--- arch/arm/plat-omap/include/dspbridge/list.h | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-)
arch/arm/plat-omap/include/dspbridge/list.h +5 -6
@@ -49,8 +49,8 @@#define LIST_ #include <dspbridge/host_os.h> -/* MEM_Calloc(), MEM_NONPAGED, MEM_Free() */ -#include <dspbridge/mem.h> +#include <linux/types.h> +#include <linux/slab.h> #include <linux/list.h> #define LST_ELEM list_head
@@ -85,9 +85,9 @@ struct LST_LIST {static inline struct LST_LIST *LST_Create (void ) {struct LST_LIST *pList; +gfp_t flags = (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL ; - pList = (struct LST_LIST *)MEM_Calloc (sizeof (struct LST_LIST ), -MEM_NONPAGED ); + pList =kzalloc (sizeof (*pList), flags);if (pList !=NULL )INIT_LIST_HEAD (&pList->head);
@@ -116,8 +116,7 @@ static inline struct LST_LIST *LST_Create(void)*/ static inline void LST_Delete (struct LST_LIST *pList) { -if (pList !=NULL ) -MEM_Free (pList); +kfree (pList); }/*
Signature · 1 line
1.5.6.5
PATCH 4/4 dspbridge: Change LST_ELEM to list_head entirely
From: Andy Shevchenko <[email protected]>
* Change struct LST_ELEM to struct list_head in whole dsp bridge driver
* Remove useless commentaries
* Minor change in the services/mem.c:
...
struct list_head *last = &mMan.lst.head;
struct list_head *curr = last->next; /* was: mMan.lst.head.next */...
--- arch/arm/plat-omap/include/dspbridge/_chnl_sm.h | 2 +- arch/arm/plat-omap/include/dspbridge/list.h | 1 - arch/arm/plat-omap/include/dspbridge/proc.h | 2 +- drivers/dsp/bridge/pmgr/cmm.c | 55 +++++++++++------------ drivers/dsp/bridge/pmgr/dev.c | 8 ++-- drivers/dsp/bridge/rmgr/drv.c | 14 +++--- drivers/dsp/bridge/rmgr/node.c | 10 ++-- drivers/dsp/bridge/rmgr/rmm.c | 16 +++--- drivers/dsp/bridge/services/cfg.c | 2 +- drivers/dsp/bridge/services/mem.c | 26 +++++----- drivers/dsp/bridge/services/ntfy.c | 12 +++--- drivers/dsp/bridge/wmd/_msg_sm.h | 4 +- drivers/dsp/bridge/wmd/chnl_sm.c | 12 +++--- drivers/dsp/bridge/wmd/io_sm.c | 10 ++-- drivers/dsp/bridge/wmd/msg_sm.c | 21 ++++----- 15 files changed, 96 insertions(+), 99 deletions(-)
arch/arm/plat-omap/include/dspbridge/_chnl_sm.h +1 -1
@@ -197,7 +197,7 @@ struct loadMonStruct {/* I/O Request/completion packet: */ struct CHNL_IRP { -struct LST_ELEM link;/* Link to next CHIRP in queue. */ +struct list_head link;/* Link to next CHIRP in queue. */ /* Buffer to be filled/emptied. (User) */ u8 *pHostUserBuf;/* Buffer to be filled/emptied. (System) */
arch/arm/plat-omap/include/dspbridge/list.h +0 -1
@@ -53,7 +53,6 @@#include <linux/slab.h> #include <linux/list.h> -#define LST_ELEM list_head#define LST_IsEmpty (l) list_empty(&(l)->head)struct LST_LIST {
arch/arm/plat-omap/include/dspbridge/proc.h +1 -1
@@ -68,7 +68,7 @@/* The PROC_OBJECT structure. */ struct PROC_OBJECT { -struct LST_ELEM link;/* Link to next PROC_OBJECT */ +struct list_head link;/* Link to next PROC_OBJECT */ u32 dwSignature;/* Used for object validation */ struct DEV_OBJECT *hDevObject;/* Device this PROC represents */ u32 hProcess;/* Process owning this Processor */
drivers/dsp/bridge/pmgr/cmm.c +27 -28
170 lines not on this page · raw message
drivers/dsp/bridge/pmgr/dev.c +4 -4
@@ -162,7 +162,7 @@/* The WMD device object: */ struct DEV_OBJECT {/* LST requires "link" to be first field! */ -struct LST_ELEM link;/* Link to next DEV_OBJECT. */ +struct list_head link;/* Link to next DEV_OBJECT. */ u32 devType;/* Device Type */ u32 dwSignature;/* Used for object validation. */ struct CFG_DEVNODE *hDevNode;/* Platform specific device id */
@@ -1045,7 +1045,7 @@ DSP_STATUS DEV_NotifyClients(struct DEV_OBJECT *hDevObject, u32 ulStatus)for (hProcObject = (DSP_HPROCESSOR )LST_First (pDevObject->procList); hProcObject !=NULL ; hProcObject = (DSP_HPROCESSOR )LST_Next (pDevObject->procList, - (struct LST_ELEM *)hProcObject)) + (struct list_head *)hProcObject))PROC_NotifyClients (hProcObject, (u32 ) ulStatus);return status;
@@ -1302,7 +1302,7 @@ DSP_STATUS DEV_InsertProcObject(struct DEV_OBJECT *hDevObject, *pbAlreadyAttached = true;/* Add DevObject to tail. */ -LST_PutTail (pDevObject->procList, (struct LST_ELEM *)hProcObject); +LST_PutTail (pDevObject->procList, (struct list_head *)hProcObject);GT_1trace (debugMask,GT_ENTER ,"Exiting DEV_InsetProcObject status 0x%x\n" , status);
@@ -1333,7 +1333,7 @@ DSP_STATUS DEV_RemoveProcObject(struct DEV_OBJECT *hDevObject, u32 hProcObject) {DSP_STATUS status =DSP_EFAIL ; -struct LST_ELEM *pCurElem; +struct list_head *pCurElem;struct DEV_OBJECT *pDevObject = (struct DEV_OBJECT *)hDevObject;DBC_Require (IsValidHandle (pDevObject));
drivers/dsp/bridge/rmgr/drv.c +7 -7
@@ -139,7 +139,7 @@ struct DRV_OBJECT {* DRV_ since it is living in this module */ struct DRV_EXT { -struct LST_ELEM link; +struct list_head link;char szString[MAXREGPATHLENGTH ]; };
@@ -916,7 +916,7 @@ u32 DRV_GetNextDevObject(u32 hDevObject)if ((pDrvObject->devList !=NULL ) && !LST_IsEmpty (pDrvObject->devList)) { dwNextDevObject = (u32 )LST_Next (pDrvObject->devList, - (struct LST_ELEM *)hDevObject); + (struct list_head *)hDevObject); } }return dwNextDevObject;
@@ -943,7 +943,7 @@ u32 DRV_GetNextDevExtension(u32 hDevExtension) !LST_IsEmpty(pDrvObject->devNodeString)) { dwDevExtension = (u32 )LST_Next (pDrvObject-> devNodeString, - (struct LST_ELEM *)hDevExtension); + (struct list_head *)hDevExtension); } }
@@ -992,7 +992,7 @@ DSP_STATUS DRV_InsertDevObject(struct DRV_OBJECT *hDRVObject,"Entering DRV_InsertProcObject hDRVObject " "0x%x\n, hDevObject 0x%x\n", hDRVObject, hDevObject); -LST_PutTail (pDRVObject->devList, (struct LST_ELEM *)hDevObject); +LST_PutTail (pDRVObject->devList, (struct list_head *)hDevObject);GT_1trace (curTrace,GT_ENTER ,"Exiting InsertDevObject status 0x%x\n" , status);
@@ -1013,7 +1013,7 @@ DSP_STATUS DRV_RemoveDevObject(struct DRV_OBJECT *hDRVObject, {DSP_STATUS status =DSP_EFAIL ;struct DRV_OBJECT *pDRVObject = (struct DRV_OBJECT *)hDRVObject; -struct LST_ELEM *pCurElem; +struct list_head *pCurElem;DBC_Require (cRefs >0 );DBC_Require (MEM_IsValidHandle (pDRVObject,SIGNATURE ));
@@ -1077,7 +1077,7 @@ DSP_STATUS DRV_RequestResources(u32 dwContext, u32 *pDevNodeString)/* Update the Driver Object List */ *pDevNodeString = (u32 )pszdevNode->szString;LST_PutTail (pDRVObject->devNodeString, - (struct LST_ELEM *)pszdevNode); + (struct list_head *)pszdevNode); }else {GT_0trace (curTrace,GT_7CLASS ,"Failed to Allocate Memory devNodeString " );
@@ -1149,7 +1149,7 @@ DSP_STATUS DRV_ReleaseResources(u32 dwContext, struct DRV_OBJECT *hDrvObject)/* Found it */ /* Delete from the Driver object list */ LST_RemoveElem (pDRVObject->devNodeString, - (struct LST_ELEM *)pszdevNode); + (struct list_head *)pszdevNode);MEM_Free ((void *) pszdevNode);break ; }
drivers/dsp/bridge/rmgr/node.c +5 -5
@@ -268,7 +268,7 @@ struct STREAM {* ======== NODE_OBJECT ======== */ struct NODE_OBJECT { -struct LST_ELEM listElem; +struct list_head listElem;u32 dwSignature;/* For object validation */ struct NODE_MGR *hNodeMgr;/* The manager of this node */ struct PROC_OBJECT *hProcessor;/* Back pointer to processor */
@@ -754,14 +754,14 @@ func_cont2:if (DSP_SUCCEEDED (status)) {/* Add the node to the node manager's list of allocated * nodes. */ -LST_InitElem ((struct LST_ELEM *)pNode); +LST_InitElem ((struct list_head *)pNode);NODE_SetState (pNode,NODE_ALLOCATED ); status =SYNC_EnterCS (hNodeMgr->hSync);if (DSP_SUCCEEDED (status)) {LST_PutTail (hNodeMgr->nodeList, - (struct LST_ELEM *) pNode); + (struct list_head *)pNode); ++(hNodeMgr->uNumNodes); }
@@ -1743,7 +1743,7 @@ func_cont1: }/* Free host side resources even if a failure occurred */ /* Remove node from hNodeMgr->nodeList */ -LST_RemoveElem (hNodeMgr->nodeList, (struct LST_ELEM *) hNode); +LST_RemoveElem (hNodeMgr->nodeList, (struct list_head *)hNode); hNodeMgr->uNumNodes--;/* Decrement count of nodes created on DSP */ if ((state != NODE_ALLOCATED) || ((state == NODE_ALLOCATED) &&
@@ -1836,7 +1836,7 @@ DSP_STATUS NODE_EnumNodes(struct NODE_MGR *hNodeMgr, IN DSP_HNODE *aNodeTab, aNodeTab[i] = hNode; hNode = (struct NODE_OBJECT *)LST_Next (hNodeMgr->nodeList, - (struct LST_ELEM *)hNode); + (struct list_head *)hNode); } *puAllocated = *puNumNodes = hNodeMgr->uNumNodes; }
drivers/dsp/bridge/rmgr/rmm.c +8 -8
@@ -84,7 +84,7 @@ struct RMM_Header {* Keeps track of memory occupied by overlay section. */ struct RMM_OvlySect { -struct LST_ELEM listElem; +struct list_head listElem;u32 addr;/* Start of memory section */ u32 size;/* Length (target MAUs) of section */ s32 page;/* Memory page */
@@ -161,7 +161,7 @@ DSP_STATUS RMM_alloc(struct RMM_TargetObj *target, u32 segid, u32 size, } prevSect = sect; sect = (struct RMM_OvlySect *)LST_Next (target->ovlyList, - (struct LST_ELEM *)sect); + (struct list_head *)sect); }if (DSP_SUCCEEDED (status)) {/* No overlap - allocate list element for new section. */
@@ -169,19 +169,19 @@ DSP_STATUS RMM_alloc(struct RMM_TargetObj *target, u32 segid, u32 size,if (newSect ==NULL ) { status =DSP_EMEMORY ; }else { -LST_InitElem ((struct LST_ELEM *)newSect); +LST_InitElem ((struct list_head *)newSect); newSect->addr = addr; newSect->size = size; newSect->page = segid;if (sect ==NULL ) {/* Put new section at the end of the list */ LST_PutTail (target->ovlyList, - (struct LST_ELEM *)newSect); + (struct list_head *)newSect); }else {/* Put new section just before sect */ LST_InsertBefore (target->ovlyList, - (struct LST_ELEM *)newSect, - (struct LST_ELEM *)sect); + (struct list_head *)newSect, + (struct list_head *)sect); } } }
@@ -388,12 +388,12 @@ bool RMM_free(struct RMM_TargetObj *target, u32 segid, u32 addr, u32 size,DBC_Assert (size == sect->size);/* Remove from list */ LST_RemoveElem (target->ovlyList, - (struct LST_ELEM *)sect); + (struct list_head *)sect);MEM_Free (sect);break ; } sect = (struct RMM_OvlySect *)LST_Next (target->ovlyList, - (struct LST_ELEM *)sect); + (struct list_head *)sect); }if (sect ==NULL ) retVal = false;
drivers/dsp/bridge/services/cfg.c +1 -1
@@ -93,7 +93,7 @@#include <dspbridge/list.h> struct DRV_EXT { -struct LST_ELEM link; +struct list_head link;char szString[MAXREGPATHLENGTH ]; };
drivers/dsp/bridge/services/mem.c +13 -13
@@ -95,7 +95,7 @@ static struct extPhysMemPool extMemPool;/* Information about each element allocated on heap */ struct memInfo { -struct LST_ELEM link;/* Must be first */ +struct list_head link;/* Must be first */ size_t size;void *caller;u32 dwSignature;/* Should be last */
@@ -119,7 +119,7 @@ static struct memMan mMan;* These functions are similar to LST_PutTail and LST_RemoveElem and are * duplicated here to make MEM independent of LST */ -static inline void MLST_PutTail (struct LST_LIST *pList,struct LST_ELEM *pElem) +static inline void MLST_PutTail (struct LST_LIST *pList,struct list_head *pElem) { pElem->prev = pList->head.prev; pElem->next = &pList->head;
@@ -128,7 +128,7 @@ static inline void MLST_PutTail(struct LST_LIST *pList, struct LST_ELEM *pElem) }static inline void MLST_RemoveElem (struct LST_LIST *pList, -struct LST_ELEM *pCurElem) +struct list_head *pCurElem) { pCurElem->prev->next = pCurElem->next; pCurElem->next->prev = pCurElem->prev;
@@ -139,8 +139,8 @@ static inline void MLST_RemoveElem(struct LST_LIST *pList,static void MEM_Check (void ) {struct memInfo *pMem; -struct LST_ELEM *last = &mMan.lst.head; -struct LST_ELEM *curr = mMan.lst.head.next; +struct list_head *last = &mMan.lst.head; +struct list_head *curr = last->next;if (!LST_IsEmpty (&mMan.lst)) {GT_0trace (MEM_debugMask,GT_7CLASS ,"*** MEMORY LEAK ***\n" );
@@ -156,7 +156,7 @@ static void MEM_Check(void) (u32 ) pMem +sizeof (struct memInfo ), pMem->size, pMem->caller);MLST_RemoveElem (&mMan.lst, - (struct LST_ELEM *) pMem); + (struct list_head *)pMem);kfree (pMem); }else { GT_1trace(MEM_debugMask, GT_7CLASS,
@@ -292,7 +292,7 @@ void *MEM_Alloc(u32 cBytes, enum MEM_POOLATTRS type)spin_lock (&mMan.lock);MLST_PutTail (&mMan.lst, - (struct LST_ELEM *)pMem); + (struct list_head *)pMem);spin_unlock (&mMan.lock); pMem = (void *)((u32)pMem +
@@ -312,7 +312,7 @@ void *MEM_Alloc(u32 cBytes, enum MEM_POOLATTRS type)spin_lock (&mMan.lock);MLST_PutTail (&mMan.lst, - (struct LST_ELEM *) pMem); + (struct list_head *)pMem);spin_unlock (&mMan.lock); pMem = (void *)((u32)pMem +
@@ -402,7 +402,7 @@ void *MEM_Calloc(u32 cBytes, enum MEM_POOLATTRS type) pMem->dwSignature = memInfoSign;spin_lock (&mMan.lock);MLST_PutTail (&mMan.lst, - (struct LST_ELEM *) pMem); + (struct list_head *)pMem);spin_unlock (&mMan.lock); pMem = (void *)((u32 )pMem +sizeof (struct memInfo ));
@@ -423,8 +423,8 @@ void *MEM_Calloc(u32 cBytes, enum MEM_POOLATTRS type) pMem->caller =__builtin_return_address (0 ); pMem->dwSignature = memInfoSign;spin_lock (&mMan.lock); -MLST_PutTail (&mMan.lst, (struct LST_ELEM *) - pMem); +MLST_PutTail (&mMan.lst, + (struct list_head *)pMem);spin_unlock (&mMan.lock); pMem = (void *)((u32 )pMem +sizeof (struct memInfo ));
@@ -528,7 +528,7 @@ void MEM_VFree(IN void *pMemBuf)if (pMem->dwSignature == memInfoSign) {spin_lock (&mMan.lock);MLST_RemoveElem (&mMan.lst, - (struct LST_ELEM *) pMem); + (struct list_head *)pMem);spin_unlock (&mMan.lock); pMem->dwSignature =0 ;vfree (pMem);
@@ -567,7 +567,7 @@ void MEM_Free(IN void *pMemBuf)if (pMem->dwSignature == memInfoSign) {spin_lock (&mMan.lock);MLST_RemoveElem (&mMan.lst, - (struct LST_ELEM *) pMem); + (struct list_head *)pMem);spin_unlock (&mMan.lock); pMem->dwSignature =0 ;kfree (pMem);
drivers/dsp/bridge/services/ntfy.c +6 -6
@@ -77,7 +77,7 @@ struct NTFY_OBJECT {* This object will be created when a client registers for events. */ struct NOTIFICATION { -struct LST_ELEM listElem; +struct list_head listElem;u32 uEventMask;/* Events to be notified about */ u32 uNotifyType;/* Type of notification to be sent */
@@ -216,7 +216,7 @@ void NTFY_Notify(struct NTFY_OBJECT *hNtfy, u32 uEventMask) } pNotify = (struct NOTIFICATION *)LST_Next (hNtfy->notifyList, - (struct LST_ELEM *)pNotify); + (struct list_head *)pNotify); } (void )SYNC_LeaveCS (hNtfy->hSync);
@@ -265,7 +265,7 @@ DSP_STATUS NTFY_Register(struct NTFY_OBJECT *hNtfy,break ; } pNotify = (struct NOTIFICATION *)LST_Next (hNtfy->notifyList, - (struct LST_ELEM *)pNotify); + (struct list_head *)pNotify); }if (pNotify ==NULL ) {/* Not registered */
@@ -280,7 +280,7 @@ DSP_STATUS NTFY_Register(struct NTFY_OBJECT *hNtfy, }if (DSP_SUCCEEDED (status)) { -LST_InitElem ((struct LST_ELEM *) pNotify); +LST_InitElem ((struct list_head *)pNotify);/* If there is more than one notification type, each * type may require its own handler code. */ status =SYNC_OpenEvent (&pNotify->hSync, &syncAttrs);
@@ -290,7 +290,7 @@ DSP_STATUS NTFY_Register(struct NTFY_OBJECT *hNtfy, pNotify->uEventMask = uEventMask; pNotify->uNotifyType = uNotifyType;LST_PutTail (hNtfy->notifyList, - (struct LST_ELEM *)pNotify); + (struct list_head *)pNotify); }else {DeleteNotify (pNotify); }
@@ -300,7 +300,7 @@ DSP_STATUS NTFY_Register(struct NTFY_OBJECT *hNtfy,if (uEventMask ==0 ) {/* Remove from list and free */ LST_RemoveElem (hNtfy->notifyList, - (struct LST_ELEM *)pNotify); + (struct list_head *)pNotify);DeleteNotify (pNotify); }else {/* Update notification mask (type shouldn't change) */
drivers/dsp/bridge/wmd/_msg_sm.h +2 -2
@@ -121,7 +121,7 @@ struct MSG_MGR {* The MSG_QUEUE's hSynEvent gets posted when a message is ready. */ struct MSG_QUEUE { -struct LST_ELEM listElem; +struct list_head listElem;u32 dwSignature;struct MSG_MGR *hMsgMgr;u32 uMaxMsgs;/* Node message depth */
@@ -150,7 +150,7 @@ struct MSG_DSPMSG {* ======== MSG_FRAME ======== */ struct MSG_FRAME { -struct LST_ELEM listElem; +struct list_head listElem;struct MSG_DSPMSG msgData; } ;
drivers/dsp/bridge/wmd/chnl_sm.c +6 -6
@@ -275,8 +275,8 @@ func_cont: pChirp->dwArg = dwArg; pChirp->status = (fIsEOS ?CHNL_IOCSTATEOS :CHNL_IOCSTATCOMPLETE ); -LST_PutTail (pChnl->pIORequests, (struct LST_ELEM *) - pChirp); +LST_PutTail (pChnl->pIORequests, + (struct list_head *)pChirp); pChnl->cIOReqs++;DBC_Assert (pChnl->cIOReqs <= pChnl->cChirps);/* If end of stream, update the channel state to prevent
@@ -361,7 +361,7 @@ DSP_STATUS WMD_CHNL_CancelIO(struct CHNL_OBJECT *hChnl) pChirp->cBytes =0 ; pChirp->status |=CHNL_IOCSTATCANCEL ;LST_PutTail (pChnl->pIOCompletions, - (struct LST_ELEM *)pChirp); + (struct list_head *)pChirp); pChnl->cIOCs++; pChnl->cIOReqs--;DBC_Assert (pChnl->cIOReqs >=0 );
@@ -715,8 +715,8 @@ DSP_STATUS WMD_CHNL_GetIOC(struct CHNL_OBJECT *hChnl, u32 dwTimeOut, ioc.dwArg = pChirp->dwArg; ioc.status |= pChirp->status;/* Place the used chirp on the free list: */ -LST_PutTail (pChnl->pFreeList, (struct LST_ELEM *) - pChirp); +LST_PutTail (pChnl->pFreeList, + (struct list_head *)pChirp); }else { ioc.pBuf =NULL ; ioc.cBytes =0 ;
@@ -1030,7 +1030,7 @@ static struct LST_LIST *CreateChirpList(u32 uChirps)/* Make N chirps and place on queue. */ for (i =0 ; (i < uChirps) && ((pChirp =MakeNewChirp ()) !=NULL ); i++) { -LST_PutTail (pChirpList, (struct LST_ELEM *)pChirp); +LST_PutTail (pChirpList, (struct list_head *)pChirp); }/* If we couldn't allocate all chirps, free those allocated: */
drivers/dsp/bridge/wmd/io_sm.c +5 -5
@@ -1355,8 +1355,8 @@ static void InputMsg(struct IO_MGR *pIOMgr, struct MSG_MGR *hMsgMgr)if (hMsgQueue->msgUsedList && pMsg) { pMsg->msgData = msg;LST_PutTail (hMsgQueue-> - msgUsedList, - (struct LST_ELEM *)pMsg); + msgUsedList, + (struct list_head *)pMsg);NTFY_Notify (hMsgQueue->hNtfy,DSP_NODEMESSAGEREADY ); SYNC_SetEvent(hMsgQueue->
@@ -1375,7 +1375,7 @@ static void InputMsg(struct IO_MGR *pIOMgr, struct MSG_MGR *hMsgMgr)if (!hMsgMgr->queueList || !hMsgQueue) goto func_end; hMsgQueue = (struct MSG_QUEUE *)LST_Next (hMsgMgr-> - queueList, (struct LST_ELEM *)hMsgQueue); + queueList, (struct list_head *)hMsgQueue); } }/* Set the post SWI flag */
@@ -1412,7 +1412,7 @@ static void NotifyChnlComplete(struct CHNL_OBJECT *pChnl,* WMD_CHNL_GetIOC(). */ fSignalEvent =LST_IsEmpty (pChnl->pIOCompletions);/* Enqueue the IO completion info for the client: */ -LST_PutTail (pChnl->pIOCompletions, (struct LST_ELEM *) pChirp); +LST_PutTail (pChnl->pIOCompletions, (struct list_head *)pChirp); pChnl->cIOCs++;if (pChnl->cIOCs > pChnl->cChirps)
@@ -1569,7 +1569,7 @@ static void OutputMsg(struct IO_MGR *pIOMgr, struct MSG_MGR *hMsgMgr)if (!hMsgMgr->msgFreeList) goto func_end;LST_PutTail (hMsgMgr->msgFreeList, - (struct LST_ELEM *) pMsg); + (struct list_head *)pMsg);SYNC_SetEvent (hMsgMgr->hSyncEvent); }else {DBG_Trace (DBG_LEVEL3 ,"pMsg is NULL\n" );
drivers/dsp/bridge/wmd/msg_sm.c +10 -11
@@ -160,7 +160,7 @@ DSP_STATUS WMD_MSG_CreateQueue(struct MSG_MGR *hMsgMgr, status =DSP_EMEMORY ; goto func_end; } -LST_InitElem ((struct LST_ELEM *) pMsgQ); +LST_InitElem ((struct list_head *)pMsgQ); pMsgQ->uMaxMsgs = uMaxMsgs; pMsgQ->hMsgMgr = hMsgMgr; pMsgQ->hArg = hArg;/* Node handle */
@@ -212,7 +212,7 @@ DSP_STATUS WMD_MSG_CreateQueue(struct MSG_MGR *hMsgMgr,DeleteMsgQueue (pMsgQ, uNumAllocated); }else {LST_PutTail (hMsgMgr->queueList, - (struct LST_ELEM *)pMsgQ); + (struct list_head *)pMsgQ); *phMsgQueue = pMsgQ;/* Signal that free frames are now available */ if (!LST_IsEmpty (hMsgMgr->msgFreeList))
@@ -264,7 +264,7 @@ void WMD_MSG_DeleteQueue(struct MSG_QUEUE *hMsgQueue) }/* Remove message queue from hMsgMgr->queueList */ (void )SYNC_EnterCS (hMsgMgr->hSyncCS); -LST_RemoveElem (hMsgMgr->queueList, (struct LST_ELEM *)hMsgQueue); +LST_RemoveElem (hMsgMgr->queueList, (struct list_head *)hMsgQueue);/* Free the message queue object */ DeleteMsgQueue (hMsgQueue, hMsgQueue->uMaxMsgs);if (!hMsgMgr->msgFreeList)
@@ -311,7 +311,7 @@ DSP_STATUS WMD_MSG_Get(struct MSG_QUEUE *hMsgQueue,if (pMsgFrame !=NULL ) { *pMsg = pMsgFrame->msgData.msg;LST_PutTail (hMsgQueue->msgFreeList, - (struct LST_ELEM *)pMsgFrame); + (struct list_head *)pMsgFrame);if (LST_IsEmpty (hMsgQueue->msgUsedList))SYNC_ResetEvent (hMsgQueue->hSyncEvent);
@@ -356,7 +356,7 @@ DSP_STATUS WMD_MSG_Get(struct MSG_QUEUE *hMsgQueue,if (pMsgFrame !=NULL ) { *pMsg = pMsgFrame->msgData.msg;LST_PutTail (hMsgQueue->msgFreeList, - (struct LST_ELEM *)pMsgFrame); + (struct list_head *)pMsgFrame); } } hMsgQueue->refCount--;
@@ -407,8 +407,8 @@ DSP_STATUS WMD_MSG_Put(struct MSG_QUEUE *hMsgQueue,if (pMsgFrame !=NULL ) { pMsgFrame->msgData.msg = *pMsg; pMsgFrame->msgData.dwId = hMsgQueue->dwId; -LST_PutTail (hMsgMgr->msgUsedList, (struct LST_ELEM *) - pMsgFrame); +LST_PutTail (hMsgMgr->msgUsedList, + (struct list_head *)pMsgFrame); hMsgMgr->uMsgsPending++; fPutMsg = true; }
@@ -460,8 +460,7 @@ DSP_STATUS WMD_MSG_Put(struct MSG_QUEUE *hMsgQueue, pMsgFrame->msgData.dwId = hMsgQueue->dwId;LST_PutTail (hMsgMgr->msgUsedList, - (struct LST_ELEM *) - pMsgFrame); + (struct list_head *)pMsgFrame); hMsgMgr->uMsgsPending++;/* Schedule a DPC, to do the actual * data transfer: */
@@ -546,8 +545,8 @@ static DSP_STATUS AddNewMsg(struct LST_LIST *msgList) pMsg = (struct MSG_FRAME *)MEM_Calloc (sizeof (struct MSG_FRAME ),MEM_PAGED );if (pMsg !=NULL ) { -LST_InitElem ((struct LST_ELEM *) pMsg); -LST_PutTail (msgList, (struct LST_ELEM *) pMsg); +LST_InitElem ((struct list_head *)pMsg); +LST_PutTail (msgList, (struct list_head *)pMsg); }else { status =DSP_EMEMORY ; }
Signature · 1 line
1.5.6.5
Re: [PATCH 3/4] dspbridge: use linux memory allocator directly
In reply to Andy ShevchenkoNice cleanups of the cra^H^Hode now one cared about!
:-)
arch/arm/plat-omap/include/dspbridge/list.h struct LST_LIST { · line 92
Quoted 12 lines · Andy Shevchenko
#define LST_ELEM list_headarch/arm/plat-omap/include/dspbridge/list.h +2
-2@@ -85,9 +85,9 @@ struct LST_LIST {static inline struct LST_LIST *LST_Create (void ) {struct LST_LIST *pList; +gfp_t flags = (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL ; - pList = (struct LST_LIST *)MEM_Calloc (sizeof (struct LST_LIST ), -MEM_NONPAGED ); + pList =kzalloc (sizeof (*pList), flags);if (pList !=NULL )INIT_LIST_HEAD (&pList->head);
Would be nice to kill this whole function as well.
arch/arm/plat-omap/include/dspbridge/list.h static inline struct LST_LIST *LST_Create(void) · line 120
Quoted 8 lines
arch/arm/plat-omap/include/dspbridge/list.h +1
-2@@ -116,8 +116,7 @@ static inline struct LST_LIST *LST_Create(void)*/ static inline void LST_Delete (struct LST_LIST *pList) { -if (pList !=NULL ) -MEM_Free (pList); +kfree (pList); }
I guess whole 'LST_Delete()' could go away as well?
Signature · 6 lines
Best Regards, Artem Bityutskiy (Артём Битюцкий) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] dspbridge: use linux memory allocator directly
Quoted 4 lines · Artem Bityutskiy
Quoted 1 line
static inline struct
LST_LIST*LST_Create(void)Would be nice to kill this whole function as well.
I guess whole '
LST_Delete()' could go away as well?
Good point, I thought to get rid of a bit later. Anyway, I will look into. But probably this mean to revert back to MEM_* calls when we would like to create or destroy list head...
Signature · 6 lines
With Best Regards, Andy Shevchenko -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html