From: Nishanth Menon <nm@ti.com>
To: Omar Ramirez Luna <omar.ramirez@ti.com>
Cc: linux-omap <linux-omap@vger.kernel.org>,
Artem Bityutskiy <dedekind1@gmail.com>,
Hiroshi Doyu <Hiroshi.DOYU@nokia.com>
Subject: Re: [PATCH 7/9] DSPBRIDGE: Remove main DPC wrapper for IO and MMUfault
Date: Wed, 25 Nov 2009 16:38:07 -0600 [thread overview]
Message-ID: <4B0DB1CF.80208@ti.com> (raw)
In-Reply-To: <1259023830-7557-8-git-send-email-omar.ramirez@ti.com>
Cosmetic comments follow:
Omar Ramirez Luna had written, on 11/23/2009 06:50 PM, the following:
> Remove DeferredProcedure which is used as a wrapper to call
> either IO or MMUfault DPCs. This also removes a custom typedef.
>
> Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
> ---
> arch/arm/plat-omap/include/dspbridge/dpc.h | 23 ------------
> arch/arm/plat-omap/include/dspbridge/io_sm.h | 2 +-
> drivers/dsp/bridge/services/dpc.c | 36 ------------------
> drivers/dsp/bridge/wmd/io_sm.c | 50 ++++++++++++++++---------
> drivers/dsp/bridge/wmd/mmu_fault.c | 2 +-
> drivers/dsp/bridge/wmd/mmu_fault.h | 2 +-
> drivers/dsp/bridge/wmd/ue_deh.c | 5 +--
> 7 files changed, 36 insertions(+), 84 deletions(-)
>
> diff --git a/arch/arm/plat-omap/include/dspbridge/dpc.h b/arch/arm/plat-omap/include/dspbridge/dpc.h
> index 0c60342..b22140f 100644
> --- a/arch/arm/plat-omap/include/dspbridge/dpc.h
> +++ b/arch/arm/plat-omap/include/dspbridge/dpc.h
> @@ -19,30 +19,10 @@
> #ifndef DPC_
> #define DPC_
>
> -/*
> - * ======== DPC_PROC ========
> - * Purpose:
> - * Deferred processing routine. Typically scheduled from an ISR to
> - * complete I/O processing.
> - * Parameters:
> - * pRefData: Ptr to user data: passed in via ISR_ScheduleDPC.
> - * Returns:
> - * Requires:
> - * The DPC should not block, or otherwise acquire resources.
> - * Interrupts to the processor are enabled.
> - * DPC_PROC executes in a critical section.
> - * Ensures:
> - * This DPC will not be reenterred on the same thread.
> - * However, the DPC may take hardware interrupts during execution.
> - * Interrupts to the processor are enabled.
> - */
> - typedef void(*DPC_PROC) (void *pRefData);
> -
> /* The DPC object, passed to our priority event callback routine: */
Use kernel coding style
> struct DPC_OBJECT {
> u32 dwSignature; /* Used for object validation. */
> void *pRefData; /* Argument for client's DPC. */
> - DPC_PROC pfnDPC; /* Client's DPC. */
> u32 numRequested; /* Number of requested DPC's. */
> u32 numScheduled; /* Number of executed DPC's. */
> struct tasklet_struct dpc_tasklet;
> @@ -81,7 +61,4 @@ struct DPC_OBJECT {
> */
> extern bool DPC_Init(void);
>
> -/* ----------------------------------- Function Prototypes */
> - void DPC_DeferredProcedure(IN unsigned long pDeferredContext);
> -
> #endif /* DPC_ */
> diff --git a/arch/arm/plat-omap/include/dspbridge/io_sm.h b/arch/arm/plat-omap/include/dspbridge/io_sm.h
> index 77f9e25..67e3834 100644
> --- a/arch/arm/plat-omap/include/dspbridge/io_sm.h
> +++ b/arch/arm/plat-omap/include/dspbridge/io_sm.h
> @@ -77,7 +77,7 @@
> * Ensures:
> * Non-preemptible (but interruptible).
> */
> - extern void IO_DPC(IN OUT void *pRefData);
> + extern void IO_DPC(IN OUT unsigned long pRefData);
remove IN OUT
>
> /*
> * ======== IO_ISR ========
> diff --git a/drivers/dsp/bridge/services/dpc.c b/drivers/dsp/bridge/services/dpc.c
> index 10bd792..bbb2d47 100644
> --- a/drivers/dsp/bridge/services/dpc.c
> +++ b/drivers/dsp/bridge/services/dpc.c
> @@ -66,39 +66,3 @@ bool DPC_Init(void)
> return true;
> }
>
> -/*
> - * ======== DeferredProcedure ========
> - * Purpose:
> - * Main DPC routine. This is called by host OS DPC callback
> - * mechanism with interrupts enabled.
> - */
> -void DPC_DeferredProcedure(IN unsigned long pDeferredContext)
> -{
> - struct DPC_OBJECT *pDPCObject = (struct DPC_OBJECT *)pDeferredContext;
> - /* read numRequested in local variable */
> - u32 requested;
> - u32 serviced;
> -
> - DBC_Require(pDPCObject != NULL);
> - requested = pDPCObject->numRequested;
> - serviced = pDPCObject->numScheduled;
> -
> - GT_1trace(DPC_DebugMask, GT_ENTER, "> DPC_DeferredProcedure "
> - "pDeferredContext=%x\n", pDeferredContext);
> - /* Rollover taken care of using != instead of < */
> - if (serviced != requested) {
> - if (pDPCObject->pfnDPC != NULL) {
> - /* Process pending DPC's: */
> - do {
> - /* Call client's DPC: */
> - (*(pDPCObject->pfnDPC))(pDPCObject->pRefData);
> - serviced++;
> - } while (serviced != requested);
> - }
> - pDPCObject->numScheduled = requested;
> - }
> - GT_2trace(DPC_DebugMask, GT_ENTER,
> - "< DPC_DeferredProcedure requested %d"
> - " serviced %d\n", requested, serviced);
> -}
> -
> diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c
> index 60dbc62..1e855ce 100644
> --- a/drivers/dsp/bridge/wmd/io_sm.c
> +++ b/drivers/dsp/bridge/wmd/io_sm.c
> @@ -255,10 +255,8 @@ DSP_STATUS WMD_IO_Create(OUT struct IO_MGR **phIOMgr,
> IO_MGRSIGNATURE);
> if (pIOMgr->hDPC) {
> tasklet_init(&pIOMgr->hDPC->dpc_tasklet,
> - DPC_DeferredProcedure, (u32)pIOMgr->hDPC);
> + IO_DPC, (u32)pIOMgr);
> /* Fill out our DPC Object: */
> - pIOMgr->hDPC->pRefData = (void *)pIOMgr;
> - pIOMgr->hDPC->pfnDPC = IO_DPC;
> pIOMgr->hDPC->numRequested = 0;
> pIOMgr->hDPC->numScheduled = 0;
> #ifdef DEBUG
> @@ -986,12 +984,14 @@ static void IO_DispatchPM(struct work_struct *work)
> * out the dispatch of I/O as a non-preemptible event.It can only be
> * pre-empted by an ISR.
> */
> -void IO_DPC(IN OUT void *pRefData)
> +void IO_DPC(IN OUT unsigned long pRefData)
> {
> struct IO_MGR *pIOMgr = (struct IO_MGR *)pRefData;
> struct CHNL_MGR *pChnlMgr;
> struct MSG_MGR *pMsgMgr;
> struct DEH_MGR *hDehMgr;
> + u32 requested;
> + u32 serviced;
>
> if (!MEM_IsValidHandle(pIOMgr, IO_MGRSIGNATURE))
> goto func_end;
> @@ -1001,24 +1001,38 @@ void IO_DPC(IN OUT void *pRefData)
> if (!MEM_IsValidHandle(pChnlMgr, CHNL_MGRSIGNATURE))
> goto func_end;
> DBG_Trace(DBG_LEVEL7, "Entering IO_DPC(0x%x)\n", pRefData);
> - /* Check value of interrupt register to ensure it is a valid error */
> - if ((pIOMgr->wIntrVal > DEH_BASE) && (pIOMgr->wIntrVal < DEH_LIMIT)) {
> - /* notify DSP/BIOS exception */
> - if (hDehMgr)
> - WMD_DEH_Notify(hDehMgr, DSP_SYSERROR, pIOMgr->wIntrVal);
> - }
> - IO_DispatchChnl(pIOMgr, NULL, IO_SERVICE);
> +
> + requested = pIOMgr->hDPC->numRequested;
> + serviced = pIOMgr->hDPC->numScheduled;
> +
> + if (serviced == requested)
> + goto func_end;
> +
> + /* Process pending DPC's */
> + do {
> + /* Check value of interrupt reg to ensure it's a valid error */
> + if ((pIOMgr->wIntrVal > DEH_BASE) &&
> + (pIOMgr->wIntrVal < DEH_LIMIT)) {
> + /* notify DSP/BIOS exception */
> + if (hDehMgr)
> + WMD_DEH_Notify(hDehMgr, DSP_SYSERROR,
> + pIOMgr->wIntrVal);
> + }
> + IO_DispatchChnl(pIOMgr, NULL, IO_SERVICE);
> #ifdef CHNL_MESSAGES
Unrelated: we need to ensure that dead code dies.. if it is not a
Kconfig option, it should probably be removed..
> - if (MEM_IsValidHandle(pMsgMgr, MSGMGR_SIGNATURE))
> - IO_DispatchMsg(pIOMgr, pMsgMgr);
> + if (MEM_IsValidHandle(pMsgMgr, MSGMGR_SIGNATURE))
> + IO_DispatchMsg(pIOMgr, pMsgMgr);
> #endif
> #ifndef DSP_TRACEBUF_DISABLED
> - if (pIOMgr->wIntrVal & MBX_DBG_CLASS) {
> - /* notify DSP Trace message */
> - if (pIOMgr->wIntrVal & MBX_DBG_SYSPRINTF)
> - PrintDSPDebugTrace(pIOMgr);
> - }
> + if (pIOMgr->wIntrVal & MBX_DBG_CLASS) {
> + /* notify DSP Trace message */
> + if (pIOMgr->wIntrVal & MBX_DBG_SYSPRINTF)
> + PrintDSPDebugTrace(pIOMgr);
> + }
> #endif
> + serviced++;
> + } while (serviced != requested);
> + pIOMgr->hDPC->numScheduled = requested;
> func_end:
> return;
> }
> diff --git a/drivers/dsp/bridge/wmd/mmu_fault.c b/drivers/dsp/bridge/wmd/mmu_fault.c
> index 0e03cd1..b3f0719 100644
> --- a/drivers/dsp/bridge/wmd/mmu_fault.c
> +++ b/drivers/dsp/bridge/wmd/mmu_fault.c
> @@ -54,7 +54,7 @@ static bool MMU_CheckIfFault(struct WMD_DEV_CONTEXT *pDevContext);
> * ======== MMU_FaultDpc ========
> * Deferred procedure call to handle DSP MMU fault.
> */
> -void MMU_FaultDpc(IN void *pRefData)
> +void MMU_FaultDpc(IN unsigned long pRefData)
remove IN
> {
> struct DEH_MGR *hDehMgr = (struct DEH_MGR *)pRefData;
> struct DEH_MGR *pDehMgr = (struct DEH_MGR *)hDehMgr;
> diff --git a/drivers/dsp/bridge/wmd/mmu_fault.h b/drivers/dsp/bridge/wmd/mmu_fault.h
> index bed466c..d3849b5 100644
> --- a/drivers/dsp/bridge/wmd/mmu_fault.h
> +++ b/drivers/dsp/bridge/wmd/mmu_fault.h
> @@ -23,7 +23,7 @@
> * ======== MMU_FaultDpc ========
> * Deferred procedure call to handle DSP MMU fault.
> */
> - void MMU_FaultDpc(IN void *pRefData);
> + void MMU_FaultDpc(IN unsigned long pRefData);
remove IN
[...]
--
Regards,
Nishanth Menon
next prev parent reply other threads:[~2009-11-25 22:38 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-24 0:50 [PATCH 0/9] dspbridge cleanup patches Omar Ramirez Luna
[not found] ` <1259023830-7557-2-git-send-email-omar.ramirez@ti.com>
2009-11-24 0:50 ` [PATCH 2/9] DSPBRIDGE: trivial checkpatch fixes Omar Ramirez Luna
[not found] ` <1259023830-7557-4-git-send-email-omar.ramirez@ti.com>
2009-11-24 0:50 ` [PATCH 4/9] DSPBRIDGE: Use _IOxx macro to define ioctls Omar Ramirez Luna
2009-11-24 0:50 ` [PATCH 5/9] DSPBRIDGE: trivial cleanup and indentation for io_sm Omar Ramirez Luna
2009-11-24 0:50 ` [PATCH 6/9] DSPBRIDGE: Remove DPC, create, destroy and schedule wrappers Omar Ramirez Luna
2009-11-24 0:50 ` [PATCH 7/9] DSPBRIDGE: Remove main DPC wrapper for IO and MMUfault Omar Ramirez Luna
2009-11-24 0:50 ` [PATCH 8/9] DSPBRIDGE: Remove DPC module from SERVICES layer Omar Ramirez Luna
2009-11-24 0:50 ` [PATCH 9/9] DSPBRIDGE: Remove DPC object structure Omar Ramirez Luna
2009-11-25 22:38 ` Nishanth Menon [this message]
2009-11-25 19:17 ` [PATCH 6/9] DSPBRIDGE: Remove DPC, create, destroy and schedule wrappers Felipe Balbi
2009-11-25 19:44 ` Ramirez Luna, Omar
2009-11-25 22:34 ` Nishanth Menon
2009-11-25 23:05 ` Ramirez Luna, Omar
2009-11-25 19:15 ` [PATCH 5/9] DSPBRIDGE: trivial cleanup and indentation for io_sm Felipe Balbi
2009-11-25 19:47 ` Ramirez Luna, Omar
2009-11-26 5:47 ` Artem Bityutskiy
2009-11-25 21:53 ` Nishanth Menon
2009-11-25 21:51 ` [PATCH 4/9] DSPBRIDGE: Use _IOxx macro to define ioctls Nishanth Menon
2009-11-25 21:37 ` [PATCH 2/9] DSPBRIDGE: trivial checkpatch fixes Nishanth Menon
2009-11-25 21:56 ` Ramirez Luna, Omar
2009-11-26 7:30 ` Hiroshi DOYU
2009-11-24 6:54 ` [PATCH 0/9] dspbridge cleanup patches Artem Bityutskiy
2009-11-25 17:32 ` Felipe Contreras
2009-11-25 20:49 ` Ramirez Luna, Omar
2009-11-25 20:56 ` Nishanth Menon
2009-11-25 21:52 ` Ramirez Luna, Omar
2009-11-25 21:56 ` Nishanth Menon
2009-11-26 13:40 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B0DB1CF.80208@ti.com \
--to=nm@ti.com \
--cc=Hiroshi.DOYU@nokia.com \
--cc=dedekind1@gmail.com \
--cc=linux-omap@vger.kernel.org \
--cc=omar.ramirez@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.