DSPBRIDGE: Remove SEEK_* redefinitions
Subsystems (2)
PATCH 1/14 DSPBRIDGE: Remove SEEK_* redefinitions
From: Guzman Lugo Fernando <[email protected]>
This patch removes the SEEK_* redefinitions in host_os.h
--- arch/arm/plat-omap/include/dspbridge/host_os.h | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
arch/arm/plat-omap/include/dspbridge/host_os.h +0 -6
@@ -60,12 +60,6 @@#include <asm/cacheflush.h> #include <linux/dma-mapping.h> -/* ----------------------------------- Macros */ - -#define SEEK_SET 0/* Seek from beginning of file. */ -#define SEEK_CUR 1/* Seek from current position. */ -#define SEEK_END 2/* Seek from end of file. */ -/* TODO -- Remove, once BP defines them */ #define INT_MAIL_MPU_IRQ 26#define INT_DSP_MMU_IRQ 28
Signature · 1 line
1.6.2.4
PATCH 2/14 DSPBRIDGE: Removes wrappers funtions of readl and writel
From: Guzman Lugo Fernando <[email protected]>
This patch change the call to RD_MEM_32_VOLATILE and WR_MEM_32_VOLATILE with __raw_readl and __raw_writel
--- drivers/dsp/bridge/hw/MLBRegAcM.h | 41 ++++---- drivers/dsp/bridge/hw/MMURegAcM.h | 62 ++++++------ drivers/dsp/bridge/hw/PRCMRegAcM.h | 181 +++++++++++++++++----------------- drivers/dsp/bridge/hw/hw_dspssC64P.c | 5 +- 4 files changed, 146 insertions(+), 143 deletions(-)
drivers/dsp/bridge/hw/MLBRegAcM.h +21 -20
@@ -18,6 +18,7 @@#define _MLB_REG_ACM_H#include <GlobalTypes.h> +#include <linux/io.h> #include <EasiGlobal.h> #include "MLBAccInt.h"
@@ -25,7 +26,7 @@#define MLBMAILBOX_SYSCONFIGReadRegister32 (baseAddress)\ (_DEBUG_LEVEL_1_EASI(EASIL1_MLBMAILBOX_SYSCONFIGReadRegister32),\ - RD_MEM_32_VOLATILE(((u32)(baseAddress))+ \ + __raw_readl(((baseAddress))+ \ MLB_MAILBOX_SYSCONFIG_OFFSET))
@@ -34,13 +35,13 @@const u32 offset =MLB_MAILBOX_SYSCONFIG_OFFSET ;\ registeru32 newValue = ((u32)(value));\_DEBUG_LEVEL_1_EASI (EASIL1_MLBMAILBOX_SYSCONFIGWriteRegister32);\ -WR_MEM_32_VOLATILE (((u32)(baseAddress))+offset, newValue);\ +__raw_writel (newValue, ((baseAddress))+offset);\ }#define MLBMAILBOX_SYSCONFIGSIdleModeRead32 (baseAddress)\ (_DEBUG_LEVEL_1_EASI(EASIL1_MLBMAILBOX_SYSCONFIGSIdleModeRead32),\ - (((RD_MEM_32_VOLATILE((((u32)(baseAddress))+\ + (((__raw_readl((((u32)(baseAddress))+\ (MLB_MAILBOX_SYSCONFIG_OFFSET)))) &\ MLB_MAILBOX_SYSCONFIG_SIdleMode_MASK) >>\ MLB_MAILBOX_SYSCONFIG_SIdleMode_OFFSET))
@@ -49,7 +50,7 @@#define MLBMAILBOX_SYSCONFIGSIdleModeWrite32 (baseAddress, value)\ {\ const u32 offset = MLB_MAILBOX_SYSCONFIG_OFFSET;\ - register u32 data = RD_MEM_32_VOLATILE(((u32)(baseAddress)) +\ + register u32 data = __raw_readl(((u32)(baseAddress)) +\ offset);\ register u32 newValue = ((u32)(value));\ _DEBUG_LEVEL_1_EASI(EASIL1_MLBMAILBOX_SYSCONFIGSIdleModeWrite32);\
@@ -57,7 +58,7 @@ newValue <<= MLB_MAILBOX_SYSCONFIG_SIdleMode_OFFSET;\ newValue &= MLB_MAILBOX_SYSCONFIG_SIdleMode_MASK;\ newValue |= data;\ -WR_MEM_32_VOLATILE ((u32)(baseAddress)+offset, newValue);\ +__raw_writel (newValue, (u32)(baseAddress)+offset);\ }
@@ -65,20 +66,20 @@ {\const u32 offset =MLB_MAILBOX_SYSCONFIG_OFFSET ;\ registeru32 data =\ -RD_MEM_32_VOLATILE (((u32)(baseAddress))+offset);\ +__raw_readl (((u32)(baseAddress))+offset);\ registeru32 newValue = ((u32)(value));\_DEBUG_LEVEL_1_EASI (EASIL1_MLBMAILBOX_SYSCONFIGSoftResetWrite32);\ data &= ~(MLB_MAILBOX_SYSCONFIG_SoftReset_MASK);\ newValue <<= MLB_MAILBOX_SYSCONFIG_SoftReset_OFFSET;\ newValue &= MLB_MAILBOX_SYSCONFIG_SoftReset_MASK;\ newValue |= data;\ -WR_MEM_32_VOLATILE ((u32)(baseAddress)+offset, newValue);\ +__raw_writel (newValue, (u32)(baseAddress)+offset);\ }#define MLBMAILBOX_SYSCONFIGAutoIdleRead32 (baseAddress)\ (_DEBUG_LEVEL_1_EASI(EASIL1_MLBMAILBOX_SYSCONFIGAutoIdleRead32),\ - (((RD_MEM_32_VOLATILE((((u32)(baseAddress))+\ + (((__raw_readl((((u32)(baseAddress))+\ (MLB_MAILBOX_SYSCONFIG_OFFSET)))) &\ MLB_MAILBOX_SYSCONFIG_AutoIdle_MASK) >>\ MLB_MAILBOX_SYSCONFIG_AutoIdle_OFFSET))
@@ -88,20 +89,20 @@ {\const u32 offset =MLB_MAILBOX_SYSCONFIG_OFFSET ;\ registeru32 data =\ -RD_MEM_32_VOLATILE (((u32)(baseAddress))+offset);\ +__raw_readl (((u32)(baseAddress))+offset);\ registeru32 newValue = ((u32)(value));\_DEBUG_LEVEL_1_EASI (EASIL1_MLBMAILBOX_SYSCONFIGAutoIdleWrite32);\ data &= ~(MLB_MAILBOX_SYSCONFIG_AutoIdle_MASK);\ newValue <<= MLB_MAILBOX_SYSCONFIG_AutoIdle_OFFSET;\ newValue &= MLB_MAILBOX_SYSCONFIG_AutoIdle_MASK;\ newValue |= data;\ -WR_MEM_32_VOLATILE ((u32)(baseAddress)+offset, newValue);\ +__raw_writel (newValue, (u32)(baseAddress)+offset);\ }#define MLBMAILBOX_SYSSTATUSResetDoneRead32 (baseAddress)\ (_DEBUG_LEVEL_1_EASI(EASIL1_MLBMAILBOX_SYSSTATUSResetDoneRead32),\ - (((RD_MEM_32_VOLATILE((((u32)(baseAddress))+\ + (((__raw_readl((((u32)(baseAddress))+\ (MLB_MAILBOX_SYSSTATUS_OFFSET)))) &\ MLB_MAILBOX_SYSSTATUS_ResetDone_MASK) >>\ MLB_MAILBOX_SYSSTATUS_ResetDone_OFFSET))
@@ -109,7 +110,7 @@#define MLBMAILBOX_MESSAGE___0_15ReadRegister32 (baseAddress, bank)\ (_DEBUG_LEVEL_1_EASI(EASIL1_MLBMAILBOX_MESSAGE___0_15ReadRegister32),\ - RD_MEM_32_VOLATILE(((u32)(baseAddress))+\ + __raw_readl(((baseAddress))+\ (MLB_MAILBOX_MESSAGE___REGSET_0_15_OFFSET +\ MLB_MAILBOX_MESSAGE___0_15_OFFSET+(\ (bank)*MLB_MAILBOX_MESSAGE___REGSET_0_15_STEP))))
@@ -122,14 +123,14 @@ ((bank)*MLB_MAILBOX_MESSAGE___REGSET_0_15_STEP );\ registeru32 newValue = ((u32)(value));\_DEBUG_LEVEL_1_EASI (EASIL1_MLBMAILBOX_MESSAGE___0_15WriteRegister32);\ -WR_MEM_32_VOLATILE (((u32)(baseAddress))+offset, newValue);\ +__raw_writel (newValue, ((baseAddress))+offset);\ }#define MLBMAILBOX_FIFOSTATUS___0_15ReadRegister32 (baseAddress, bank)\ (_DEBUG_LEVEL_1_EASI(\ EASIL1_MLBMAILBOX_FIFOSTATUS___0_15ReadRegister32),\ - RD_MEM_32_VOLATILE(((u32)(baseAddress))+\ + __raw_readl(((u32)(baseAddress))+\ (MLB_MAILBOX_FIFOSTATUS___REGSET_0_15_OFFSET +\ MLB_MAILBOX_FIFOSTATUS___0_15_OFFSET+\ ((bank)*MLB_MAILBOX_FIFOSTATUS___REGSET_0_15_STEP))))
@@ -138,7 +139,7 @@#define MLBMAILBOX_FIFOSTATUS___0_15FifoFullMBmRead32 (baseAddress, bank)\ (_DEBUG_LEVEL_1_EASI(\ EASIL1_MLBMAILBOX_FIFOSTATUS___0_15FifoFullMBmRead32),\ - (((RD_MEM_32_VOLATILE(((u32)(baseAddress))+\ + (((__raw_readl(((baseAddress))+\ (MLB_MAILBOX_FIFOSTATUS___REGSET_0_15_OFFSET +\ MLB_MAILBOX_FIFOSTATUS___0_15_OFFSET+\ ((bank)*MLB_MAILBOX_FIFOSTATUS___REGSET_0_15_STEP)))) &\
@@ -149,7 +150,7 @@#define MLBMAILBOX_MSGSTATUS___0_15NbOfMsgMBmRead32 (baseAddress, bank)\ (_DEBUG_LEVEL_1_EASI(\ EASIL1_MLBMAILBOX_MSGSTATUS___0_15NbOfMsgMBmRead32),\ - (((RD_MEM_32_VOLATILE(((u32)(baseAddress))+\ + (((__raw_readl(((baseAddress))+\ (MLB_MAILBOX_MSGSTATUS___REGSET_0_15_OFFSET +\ MLB_MAILBOX_MSGSTATUS___0_15_OFFSET+\ ((bank)*MLB_MAILBOX_MSGSTATUS___REGSET_0_15_STEP)))) &\
@@ -159,7 +160,7 @@#define MLBMAILBOX_IRQSTATUS___0_3ReadRegister32 (baseAddress, bank)\ (_DEBUG_LEVEL_1_EASI(EASIL1_MLBMAILBOX_IRQSTATUS___0_3ReadRegister32),\ - RD_MEM_32_VOLATILE(((u32)(baseAddress))+\ + __raw_readl(((baseAddress))+\ (MLB_MAILBOX_IRQSTATUS___REGSET_0_3_OFFSET +\ MLB_MAILBOX_IRQSTATUS___0_3_OFFSET+\ ((bank)*MLB_MAILBOX_IRQSTATUS___REGSET_0_3_STEP))))
@@ -172,13 +173,13 @@ ((bank)*MLB_MAILBOX_IRQSTATUS___REGSET_0_3_STEP );\ registeru32 newValue = ((u32)(value));\_DEBUG_LEVEL_1_EASI (EASIL1_MLBMAILBOX_IRQSTATUS___0_3WriteRegister32);\ -WR_MEM_32_VOLATILE (((u32)(baseAddress))+offset, newValue);\ +__raw_writel (newValue, ((baseAddress))+offset);\ }#define MLBMAILBOX_IRQENABLE___0_3ReadRegister32 (baseAddress, bank)\ (_DEBUG_LEVEL_1_EASI(EASIL1_MLBMAILBOX_IRQENABLE___0_3ReadRegister32),\ - RD_MEM_32_VOLATILE(((u32)(baseAddress))+\ + __raw_readl(((baseAddress))+\ (MLB_MAILBOX_IRQENABLE___REGSET_0_3_OFFSET +\ MLB_MAILBOX_IRQENABLE___0_3_OFFSET+\ ((bank)*MLB_MAILBOX_IRQENABLE___REGSET_0_3_STEP))))
@@ -191,7 +192,7 @@ ((bank)*MLB_MAILBOX_IRQENABLE___REGSET_0_3_STEP );\ registeru32 newValue = ((u32)(value));\_DEBUG_LEVEL_1_EASI (EASIL1_MLBMAILBOX_IRQENABLE___0_3WriteRegister32);\ -WR_MEM_32_VOLATILE (((u32)(baseAddress))+offset, newValue);\ +__raw_writel (newValue, ((baseAddress))+offset);\ }
drivers/dsp/bridge/hw/MMURegAcM.h +31 -31
240 lines not on this page · raw message
drivers/dsp/bridge/hw/PRCMRegAcM.h +91 -90
663 lines not on this page · raw message
drivers/dsp/bridge/hw/hw_dspssC64P.c +3 -2
@@ -27,6 +27,7 @@/* PROJECT SPECIFIC INCLUDE FILES */ #include <GlobalTypes.h> +#include <linux/io.h> #include <hw_defs.h> #include <hw_dspssC64P.h> #include <IVA2RegAcM.h>
@@ -43,13 +44,13 @@ HW_STATUS HW_DSPSS_BootModeSet(const u32 baseAddress,/* if Boot mode it DIRECT BOOT, check that the bootAddress is * aligned to atleast 1K :: TODO */ -WR_MEM_32_VOLATILE ((baseAddress) + offset, bootMode); +__raw_writel (bootMode, (baseAddress) + offset); offset =SYSC_IVA2BOOTADDR_OFFSET ; alignedBootAddr = bootAddress &SYSC_IVA2BOOTADDR_MASK ; -WR_MEM_32_VOLATILE ((baseAddress) + offset, alignedBootAddr); +__raw_writel (alignedBootAddr, (baseAddress) + offset);return status; }
Signature · 1 line
1.6.2.4
PATCH 3/14 DSPBRIDGE: Fixed Double notification when a sys_error happens
There is no need to keep sending notifications once an mmu fault or sys error was sent, one notification should be enough to signal the reload of baseimage for recovery.
--- drivers/dsp/bridge/wmd/ue_deh.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-)
drivers/dsp/bridge/wmd/ue_deh.c +11 -2
@@ -197,6 +197,7 @@ void WMD_DEH_Notify(struct DEH_MGR *hDehMgr, u32 ulEventMask,struct DEH_MGR *pDehMgr = (struct DEH_MGR *)hDehMgr;struct WMD_DEV_CONTEXT *pDevContext;DSP_STATUS status =DSP_SOK ; +DSP_STATUS status1 =DSP_EFAIL ;u32 memPhysical =0 ;u32 HW_MMU_MAX_TLB_COUNT =31 ;u32 extern faultAddr;
@@ -285,6 +286,11 @@ void WMD_DEH_Notify(struct DEH_MGR *hDehMgr, u32 ulEventMask, "0x%x\n", dwErrInfo);break ; } + +/* Filter subsequent notifications when an error occurs */ +if (pDevContext->dwBrdState !=BRD_ERROR ) + status1 =DSP_SOK ; +/* Set the Board state as ERROR */ pDevContext->dwBrdState =BRD_ERROR ;/* Disable all the clocks that were enabled by DSP */
@@ -292,8 +298,11 @@ void WMD_DEH_Notify(struct DEH_MGR *hDehMgr, u32 ulEventMask,/* Call DSP Trace Buffer */ PrintDspTraceBuffer (hDehMgr->hWmdContext); -/* Signal DSP error/exception event. */ -NTFY_Notify (pDehMgr->hNtfy, ulEventMask); +if (DSP_SUCCEEDED (status1)) { +/* Signal DSP error/exception event. */ +NTFY_Notify (pDehMgr->hNtfy, ulEventMask); + } + }DBG_Trace (DBG_LEVEL1 ,"Exiting WMD_DEH_Notify\n" );
Signature · 1 line
1.6.2.4
PATCH 4/14 DSPBRIDGE: Fixed typo in debug traces
From: Omar Ramirez Luna <[email protected]>
Fixed typo in Bridge traces for Msg and Nldr.
--- drivers/dsp/bridge/pmgr/msg.c | 2 +- drivers/dsp/bridge/rmgr/nldr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/dsp/bridge/pmgr/msg.c +1 -1
@@ -158,7 +158,7 @@ bool MSG_Init(void)if (cRefs ==0 ) {DBC_Assert (!MSG_debugMask.flags); -GT_create (&MSG_debugMask,"MG" );/* "MG" for MsG */ +GT_create (&MSG_debugMask,"MS" );/* "MS" for MSg */ } cRefs++;
drivers/dsp/bridge/rmgr/nldr.c +1 -1
@@ -893,7 +893,7 @@ bool NLDR_Init(void)if (cRefs ==0 ) {DBC_Assert (!NLDR_debugMask.flags); -GT_create (&NLDR_debugMask,"DL" );/* "DL" for DLdr */ +GT_create (&NLDR_debugMask,"NL" );/* "NL" for NLdr */ RMM_init (); }
Signature · 1 line
1.6.2.4
PATCH 5/14 DSPBRIDGE: Change address resources to void __iomem *
From: Guzman Lugo Fernando <[email protected]>
This patch changes address resources to void __iomem *
Ported for linux-omap-pm bridge-2.6.29 branch.
--- arch/arm/plat-omap/include/dspbridge/cfgdefs.h | 20 +++++----- drivers/dsp/bridge/hw/hw_dspssC64P.c | 2 +- drivers/dsp/bridge/hw/hw_dspssC64P.h | 2 +- drivers/dsp/bridge/hw/hw_mbox.c | 25 ++++++------ drivers/dsp/bridge/hw/hw_mbox.h | 16 ++++---- drivers/dsp/bridge/hw/hw_mmu.c | 41 ++++++++++---------- drivers/dsp/bridge/hw/hw_mmu.h | 28 +++++++------- drivers/dsp/bridge/hw/hw_prcm.c | 26 ++++++------ drivers/dsp/bridge/hw/hw_prcm.h | 17 ++++---- drivers/dsp/bridge/rmgr/drv.c | 38 +++++++++--------- drivers/dsp/bridge/rmgr/node.c | 2 +- drivers/dsp/bridge/wmd/_tiomap.h | 2 +- drivers/dsp/bridge/wmd/tiomap3430.c | 49 ++++++++++++------------ 13 files changed, 135 insertions(+), 133 deletions(-)
arch/arm/plat-omap/include/dspbridge/cfgdefs.h +10 -10
@@ -96,16 +96,16 @@u32 dwChnlOffset;u32 dwChnlBufSize;u32 dwNumChnls; -u32 dwPrmBase; -u32 dwCmBase; -u32 dwPerBase; -u32 dwPerPmBase; -u32 dwCorePmBase; -u32 dwWdTimerDspBase; -u32 dwMboxBase; -u32 dwDmmuBase; -u32 dwDipiBase; -u32 dwSysCtrlBase; +void __iomem *dwPrmBase; +void __iomem *dwCmBase; +void __iomem *dwPerBase; +u32 dwPerPmBase; +u32 dwCorePmBase; +void __iomem *dwWdTimerDspBase; +void __iomem *dwMboxBase; +void __iomem *dwDmmuBase; +u32 *dwDipiBase; +void __iomem *dwSysCtrlBase; } ;struct CFG_DSPMEMDESC {
drivers/dsp/bridge/hw/hw_dspssC64P.c +1 -1
@@ -34,7 +34,7 @@#include <IPIAccInt.h> /* HW FUNCTIONS */ -HW_STATUS HW_DSPSS_BootModeSet (const u32 baseAddress, +HW_STATUS HW_DSPSS_BootModeSet (const void __iomem *baseAddress,enum HW_DSPSYSC_BootMode_t bootMode,const u32 bootAddress) {
drivers/dsp/bridge/hw/hw_dspssC64P.h +1 -1
@@ -41,7 +41,7 @@#define HW_DSP_IDLEBOOT_ADDR 0x007E0000 -extern HW_STATUS HW_DSPSS_BootModeSet (const u32 baseAddress, +extern HW_STATUS HW_DSPSS_BootModeSet (const void __iomem *baseAddress,enum HW_DSPSYSC_BootMode_t bootMode,const u32 bootAddress);
drivers/dsp/bridge/hw/hw_mbox.c +13 -12
@@ -36,7 +36,7 @@struct MAILBOX_CONTEXT mboxsetting = {0x4 ,0x1 ,0x1 };/* Saves the mailbox context */ -HW_STATUS HW_MBOX_saveSettings (u32 baseAddress) +HW_STATUS HW_MBOX_saveSettings (void __iomem *baseAddress) {HW_STATUS status =RET_OK ;
@@ -50,7 +50,7 @@ HW_STATUS HW_MBOX_saveSettings(u32 baseAddress) }/* Restores the mailbox context */ -HW_STATUS HW_MBOX_restoreSettings (u32 baseAddress) +HW_STATUS HW_MBOX_restoreSettings (void __iomem *baseAddress) {HW_STATUS status =RET_OK ;/* Restor IRQ enable status */
@@ -65,8 +65,8 @@ HW_STATUS HW_MBOX_restoreSettings(u32 baseAddress)/* Reads a u32 from the sub module message box Specified. if there are no * messages in the mailbox then and error is returned. */ -HW_STATUS HW_MBOX_MsgRead (const u32 baseAddress,const HW_MBOX_Id_t mailBoxId, -u32 *const pReadValue) +HW_STATUS HW_MBOX_MsgRead (const void __iomem *baseAddress, +const HW_MBOX_Id_t mailBoxId,u32 *const pReadValue) {HW_STATUS status =RET_OK ;
@@ -86,8 +86,8 @@ HW_STATUS HW_MBOX_MsgRead(const u32 baseAddress, const HW_MBOX_Id_t mailBoxId, }/* Writes a u32 from the sub module message box Specified. */ -HW_STATUS HW_MBOX_MsgWrite (const u32 baseAddress,const HW_MBOX_Id_t mailBoxId, -const u32 writeValue) +HW_STATUS HW_MBOX_MsgWrite (const void __iomem *baseAddress, +const HW_MBOX_Id_t mailBoxId,const u32 writeValue) {HW_STATUS status =RET_OK ;
@@ -105,8 +105,8 @@ HW_STATUS HW_MBOX_MsgWrite(const u32 baseAddress, const HW_MBOX_Id_t mailBoxId, }/* Gets number of messages in a specified mailbox. */ -HW_STATUS HW_MBOX_NumMsgGet (const u32 baseAddress,const HW_MBOX_Id_t mailBoxId, -u32 *const pNumMsg) +HW_STATUS HW_MBOX_NumMsgGet (const void __iomem *baseAddress, +const HW_MBOX_Id_t mailBoxId,u32 *const pNumMsg) {HW_STATUS status =RET_OK ;
@@ -127,7 +127,7 @@ HW_STATUS HW_MBOX_NumMsgGet(const u32 baseAddress, const HW_MBOX_Id_t mailBoxId, }/* Enables the specified IRQ. */ -HW_STATUS HW_MBOX_EventEnable (const u32 baseAddress, +HW_STATUS HW_MBOX_EventEnable (const void __iomem *baseAddress,const HW_MBOX_Id_t mailBoxId,const HW_MBOX_UserId_t userId,const u32 events)
@@ -167,7 +167,7 @@ HW_STATUS HW_MBOX_EventEnable(const u32 baseAddress, }/* Disables the specified IRQ. */ -HW_STATUS HW_MBOX_EventDisable (const u32 baseAddress, +HW_STATUS HW_MBOX_EventDisable (const void __iomem *baseAddress,const HW_MBOX_Id_t mailBoxId,const HW_MBOX_UserId_t userId,const u32 events)
@@ -201,8 +201,9 @@ HW_STATUS HW_MBOX_EventDisable(const u32 baseAddress, }/* Sets the status of the specified IRQ. */ -HW_STATUS HW_MBOX_EventAck (const u32 baseAddress,const HW_MBOX_Id_t mailBoxId, -const HW_MBOX_UserId_t userId,const u32 event) +HW_STATUS HW_MBOX_EventAck (const void __iomem *baseAddress, +const HW_MBOX_Id_t mailBoxId,const HW_MBOX_UserId_t userId, +const u32 event) {HW_STATUS status =RET_OK ;u32 irqStatusReg;
drivers/dsp/bridge/hw/hw_mbox.h +8 -8
@@ -92,7 +92,7 @@ struct MAILBOX_CONTEXT {* box Specified. if there are no messages in the mailbox * then and error is returned. */ -extern HW_STATUS HW_MBOX_MsgRead (const u32 baseAddress, +extern HW_STATUS HW_MBOX_MsgRead (const void __iomem *baseAddress,const HW_MBOX_Id_t mailBoxId,u32 *const pReadValue);
@@ -124,7 +124,7 @@ extern HW_STATUS HW_MBOX_MsgRead(const u32 baseAddress,* box Specified. */ extern HW_STATUS HW_MBOX_MsgWrite ( -const u32 baseAddress, +const void __iomem *baseAddress,const HW_MBOX_Id_t mailBoxId,const u32 writeValue );
@@ -158,7 +158,7 @@ extern HW_STATUS HW_MBOX_MsgWrite(* PURPOSE: : this function gets number of messages in a specified mailbox. */ extern HW_STATUS HW_MBOX_NumMsgGet ( -const u32 baseAddress, +const void __iomem *baseAddress,const HW_MBOX_Id_t mailBoxId,u32 *const pNumMsg );
@@ -194,7 +194,7 @@ extern HW_STATUS HW_MBOX_NumMsgGet(* PURPOSE: : this function enables the specified IRQ. */ extern HW_STATUS HW_MBOX_EventEnable ( -const u32 baseAddress, +const void __iomem *baseAddress,const HW_MBOX_Id_t mailBoxId,const HW_MBOX_UserId_t userId, const u32 events
@@ -231,7 +231,7 @@ extern HW_STATUS HW_MBOX_EventEnable(* PURPOSE: : this function disables the specified IRQ. */ extern HW_STATUS HW_MBOX_EventDisable ( -const u32 baseAddress, +const void __iomem *baseAddress,const HW_MBOX_Id_t mailBoxId,const HW_MBOX_UserId_t userId, const u32 events
@@ -270,7 +270,7 @@ extern HW_STATUS HW_MBOX_EventDisable(* PURPOSE: : this function sets the status of the specified IRQ. */ extern HW_STATUS HW_MBOX_EventAck ( -const u32 baseAddress, +const void __iomem *baseAddress,const HW_MBOX_Id_t mailBoxId,const HW_MBOX_UserId_t userId, const u32 event
@@ -296,7 +296,7 @@ extern HW_STATUS HW_MBOX_EventAck(* * PURPOSE: : this function saves the context of mailbox */ -extern HW_STATUS HW_MBOX_saveSettings (u32 baseAddres); +extern HW_STATUS HW_MBOX_saveSettings (void __iomem *baseAddres);/* * FUNCTION : HW_MBOX_restoreSettings
@@ -318,6 +318,6 @@ extern HW_STATUS HW_MBOX_saveSettings(u32 baseAddres);* * PURPOSE: : this function restores the context of mailbox */ -extern HW_STATUS HW_MBOX_restoreSettings (u32 baseAddres); +extern HW_STATUS HW_MBOX_restoreSettings (void __iomem *baseAddres);#endif /* __MBOX_H */
drivers/dsp/bridge/hw/hw_mmu.c +21 -20
167 lines not on this page · raw message
drivers/dsp/bridge/hw/hw_mmu.h +14 -14
@@ -54,45 +54,45 @@ struct HW_MMUMapAttrs_t {bool donotlockmpupage; } ; -extern HW_STATUS HW_MMU_Enable (const u32 baseAddress); +extern HW_STATUS HW_MMU_Enable (const void __iomem *baseAddress); -extern HW_STATUS HW_MMU_Disable (const u32 baseAddress); +extern HW_STATUS HW_MMU_Disable (const void __iomem *baseAddress); -extern HW_STATUS HW_MMU_NumLockedSet (const u32 baseAddress, +extern HW_STATUS HW_MMU_NumLockedSet (const void __iomem *baseAddress,u32 numLockedEntries); -extern HW_STATUS HW_MMU_VictimNumSet (const u32 baseAddress, +extern HW_STATUS HW_MMU_VictimNumSet (const void __iomem *baseAddress,u32 victimEntryNum);/* For MMU faults */ -extern HW_STATUS HW_MMU_EventAck (const u32 baseAddress, +extern HW_STATUS HW_MMU_EventAck (const void __iomem *baseAddress,u32 irqMask); -extern HW_STATUS HW_MMU_EventDisable (const u32 baseAddress, +extern HW_STATUS HW_MMU_EventDisable (const void __iomem *baseAddress,u32 irqMask); -extern HW_STATUS HW_MMU_EventEnable (const u32 baseAddress, +extern HW_STATUS HW_MMU_EventEnable (const void __iomem *baseAddress,u32 irqMask); -extern HW_STATUS HW_MMU_EventStatus (const u32 baseAddress, +extern HW_STATUS HW_MMU_EventStatus (const void __iomem *baseAddress,u32 *irqMask); -extern HW_STATUS HW_MMU_FaultAddrRead (const u32 baseAddress, +extern HW_STATUS HW_MMU_FaultAddrRead (const void __iomem *baseAddress,u32 *addr);/* Set the TT base address */ -extern HW_STATUS HW_MMU_TTBSet (const u32 baseAddress, +extern HW_STATUS HW_MMU_TTBSet (const void __iomem *baseAddress,u32 TTBPhysAddr); -extern HW_STATUS HW_MMU_TWLEnable (const u32 baseAddress); +extern HW_STATUS HW_MMU_TWLEnable (const void __iomem *baseAddress); -extern HW_STATUS HW_MMU_TWLDisable (const u32 baseAddress); +extern HW_STATUS HW_MMU_TWLDisable (const void __iomem *baseAddress); -extern HW_STATUS HW_MMU_TLBFlush (const u32 baseAddress, +extern HW_STATUS HW_MMU_TLBFlush (const void __iomem *baseAddress,u32 virtualAddr,u32 pageSize); -extern HW_STATUS HW_MMU_TLBAdd(const u32 baseAddress, +extern HW_STATUS HW_MMU_TLBAdd(const void __iomem *baseAddress, u32 physicalAddr, u32 virtualAddr, u32 pageSize,
drivers/dsp/bridge/hw/hw_prcm.c +13 -13
@@ -29,21 +29,21 @@#include <hw_defs.h> #include <hw_prcm.h> -static HW_STATUS HW_RST_WriteVal (const u32 baseAddress, +static HW_STATUS HW_RST_WriteVal (const void __iomem *baseAddress,enum HW_RstModule_t r,enum HW_SetClear_t val); -HW_STATUS HW_RST_Reset (const u32 baseAddress,enum HW_RstModule_t r) +HW_STATUS HW_RST_Reset (const void __iomem *baseAddress,enum HW_RstModule_t r) {return HW_RST_WriteVal (baseAddress, r,HW_SET ); } -HW_STATUS HW_RST_UnReset (const u32 baseAddress,enum HW_RstModule_t r) +HW_STATUS HW_RST_UnReset (const void __iomem *baseAddress,enum HW_RstModule_t r) {return HW_RST_WriteVal (baseAddress, r,HW_CLEAR ); } -static HW_STATUS HW_RST_WriteVal (const u32 baseAddress, +static HW_STATUS HW_RST_WriteVal (const void __iomem *baseAddress,enum HW_RstModule_t r,enum HW_SetClear_t val) {
@@ -66,8 +66,8 @@ static HW_STATUS HW_RST_WriteVal(const u32 baseAddress,return status; } -HW_STATUS HW_PWR_IVA2StateGet (const u32 baseAddress,enum HW_PwrModule_t p, -enum HW_PwrState_t *value) +HW_STATUS HW_PWR_IVA2StateGet (const void __iomem *baseAddress, +enum HW_PwrModule_t p,enum HW_PwrState_t *value) {HW_STATUS status =RET_OK ;u32 temp;
@@ -93,7 +93,7 @@ HW_STATUS HW_PWR_IVA2StateGet(const u32 baseAddress, enum HW_PwrModule_t p,return status; } -HW_STATUS HW_PWRST_IVA2RegGet (const u32 baseAddress,u32 *value) +HW_STATUS HW_PWRST_IVA2RegGet (const void __iomem *baseAddress,u32 *value) {HW_STATUS status =RET_OK ;
@@ -103,7 +103,7 @@ HW_STATUS HW_PWRST_IVA2RegGet(const u32 baseAddress, u32 *value) } -HW_STATUS HW_PWR_IVA2PowerStateSet (const u32 baseAddress, +HW_STATUS HW_PWR_IVA2PowerStateSet (const void __iomem *baseAddress,enum HW_PwrModule_t p,enum HW_PwrState_t value) {
@@ -135,7 +135,7 @@ HW_STATUS HW_PWR_IVA2PowerStateSet(const u32 baseAddress,return status; } -HW_STATUS HW_PWR_CLKCTRL_IVA2RegSet (const u32 baseAddress, +HW_STATUS HW_PWR_CLKCTRL_IVA2RegSet (const void __iomem *baseAddress,enum HW_TransitionState_t val) {HW_STATUS status =RET_OK ;
@@ -146,8 +146,8 @@ HW_STATUS HW_PWR_CLKCTRL_IVA2RegSet(const u32 baseAddress, } -HW_STATUS HW_RSTST_RegGet (const u32 baseAddress,enum HW_RstModule_t m, -u32 *value) +HW_STATUS HW_RSTST_RegGet (const void __iomem *baseAddress, +enum HW_RstModule_t m,u32 *value) {HW_STATUS status =RET_OK ;
@@ -156,8 +156,8 @@ HW_STATUS HW_RSTST_RegGet(const u32 baseAddress, enum HW_RstModule_t m,return status; } -HW_STATUS HW_RSTCTRL_RegGet (const u32 baseAddress,enum HW_RstModule_t m, -u32 *value) +HW_STATUS HW_RSTCTRL_RegGet (const void __iomem *baseAddress, +enum HW_RstModule_t m,u32 *value) {HW_STATUS status =RET_OK ;
drivers/dsp/bridge/hw/hw_prcm.h +9 -8
@@ -132,16 +132,16 @@ enum HW_TransitionState_t { } ; -extern HW_STATUS HW_RST_Reset (const u32 baseAddress, +extern HW_STATUS HW_RST_Reset (const void __iomem *baseAddress,enum HW_RstModule_t r); -extern HW_STATUS HW_RST_UnReset (const u32 baseAddress, +extern HW_STATUS HW_RST_UnReset (const void __iomem *baseAddress,enum HW_RstModule_t r); -extern HW_STATUS HW_RSTCTRL_RegGet (const u32 baseAddress, +extern HW_STATUS HW_RSTCTRL_RegGet (const void __iomem *baseAddress,enum HW_RstModule_t p,u32 *value); -extern HW_STATUS HW_RSTST_RegGet (const u32 baseAddress, +extern HW_STATUS HW_RSTST_RegGet (const void __iomem *baseAddress,enum HW_RstModule_t p,u32 *value); extern HW_STATUS HW_PWR_PowerStateSet(const u32 baseAddress,
@@ -152,17 +152,18 @@ extern HW_STATUS HW_CLK_SetInputClock(const u32 baseAddress,enum HW_GPtimer_t gpt, enum HW_Clocktype_t c); -extern HW_STATUS HW_PWR_IVA2StateGet (const u32 baseAddress, +extern HW_STATUS HW_PWR_IVA2StateGet (const void __iomem *baseAddress,enum HW_PwrModule_t p,enum HW_PwrState_t *value); -extern HW_STATUS HW_PWRST_IVA2RegGet (const u32 baseAddress,u32 *value); +extern HW_STATUS HW_PWRST_IVA2RegGet (const void __iomem *baseAddress, +u32 *value); -extern HW_STATUS HW_PWR_IVA2PowerStateSet (const u32 baseAddress, +extern HW_STATUS HW_PWR_IVA2PowerStateSet (const void __iomem *baseAddress,enum HW_PwrModule_t p,enum HW_PwrState_t value); -extern HW_STATUS HW_PWR_CLKCTRL_IVA2RegSet (const u32 baseAddress, +extern HW_STATUS HW_PWR_CLKCTRL_IVA2RegSet (const void __iomem *baseAddress,enum HW_TransitionState_t val);#endif /* __HW_PRCM_H */
drivers/dsp/bridge/rmgr/drv.c +19 -19
@@ -1653,11 +1653,11 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest) pResources->dwMemPhys[1 ] =0 ;if (pResources->dwPrmBase) -iounmap ((void *)pResources->dwPrmBase); +iounmap (pResources->dwPrmBase);if (pResources->dwCmBase) -iounmap ((void *)pResources->dwCmBase); +iounmap (pResources->dwCmBase);if (pResources->dwMboxBase) -iounmap ((void *)pResources->dwMboxBase); +iounmap (pResources->dwMboxBase);if (pResources->dwMemBase[0 ])iounmap ((void *)pResources->dwMemBase[0 ]);if (pResources->dwMemBase[2 ])
@@ -1667,29 +1667,29 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest)if (pResources->dwMemBase[4 ])iounmap ((void *)pResources->dwMemBase[4 ]);if (pResources->dwWdTimerDspBase) -iounmap ((void *)pResources->dwWdTimerDspBase); +iounmap (pResources->dwWdTimerDspBase);if (pResources->dwDmmuBase) -iounmap ((void *)pResources->dwDmmuBase); +iounmap (pResources->dwDmmuBase);if (pResources->dwPerBase) -iounmap ((void *)pResources->dwPerBase); +iounmap (pResources->dwPerBase);if (pResources->dwPerPmBase)iounmap ((void *)pResources->dwPerPmBase);if (pResources->dwCorePmBase)iounmap ((void *)pResources->dwCorePmBase);if (pResources->dwSysCtrlBase) { -iounmap ((void *)pResources->dwSysCtrlBase); +iounmap (pResources->dwSysCtrlBase);/* don't set pResources->dwSysCtrlBase to null * as it is used in BOARD_Stop */ } - pResources->dwPrmBase = (u32 )NULL ; - pResources->dwCmBase = (u32 )NULL ; - pResources->dwMboxBase = (u32 )NULL ; + pResources->dwPrmBase =NULL ; + pResources->dwCmBase =NULL ; + pResources->dwMboxBase =NULL ; pResources->dwMemBase[0 ] = (u32 )NULL ; pResources->dwMemBase[2 ] = (u32 )NULL ; pResources->dwMemBase[3 ] = (u32 )NULL ; pResources->dwMemBase[4 ] = (u32 )NULL ; - pResources->dwWdTimerDspBase = (u32 )NULL ; - pResources->dwDmmuBase = (u32 )NULL ; + pResources->dwWdTimerDspBase =NULL ; + pResources->dwDmmuBase =NULL ; dwBuffSize =sizeof (struct CFG_HOSTRES ); status = REG_SetValue(NULL, (char *)driverExt->szString,
@@ -1708,13 +1708,13 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest) pResources->wNumMemWindows =2 ;/* First window is for DSP internal memory */ - pResources->dwPrmBase = (u32 )ioremap (OMAP_IVA2_PRM_BASE , + pResources->dwPrmBase =ioremap (OMAP_IVA2_PRM_BASE ,OMAP_IVA2_PRM_SIZE ); - pResources->dwCmBase = (u32 )ioremap (OMAP_IVA2_CM_BASE , + pResources->dwCmBase =ioremap (OMAP_IVA2_CM_BASE ,OMAP_IVA2_CM_SIZE ); - pResources->dwMboxBase = (u32 )ioremap (OMAP_MBOX_BASE , + pResources->dwMboxBase =ioremap (OMAP_MBOX_BASE ,OMAP_MBOX_SIZE ); - pResources->dwSysCtrlBase = (u32 )ioremap (OMAP_SYSC_BASE , + pResources->dwSysCtrlBase =ioremap (OMAP_SYSC_BASE ,OMAP_SYSC_SIZE );GT_1trace (curTrace,GT_2CLASS ,"dwMemBase[0] 0x%x\n" , pResources->dwMemBase[0 ]);
@@ -1807,15 +1807,15 @@ static DSP_STATUS RequestBridgeResourcesDSP(u32 dwContext, s32 bRequest) OMAP_DSP_MEM2_SIZE); pResources->dwMemBase[4 ] = (u32 )ioremap (OMAP_DSP_MEM3_BASE ,OMAP_DSP_MEM3_SIZE ); - pResources->dwPerBase = (u32 )ioremap (OMAP_PER_CM_BASE , + pResources->dwPerBase =ioremap (OMAP_PER_CM_BASE ,OMAP_PER_CM_SIZE ); pResources->dwPerPmBase = (u32 )ioremap (OMAP_PER_PRM_BASE ,OMAP_PER_PRM_SIZE ); pResources->dwCorePmBase = (u32 )ioremap (OMAP_CORE_PRM_BASE ,OMAP_CORE_PRM_SIZE ); - pResources->dwDmmuBase = (u32 )ioremap (OMAP_DMMU_BASE , + pResources->dwDmmuBase =ioremap (OMAP_DMMU_BASE ,OMAP_DMMU_SIZE ); - pResources->dwWdTimerDspBase =0 ; + pResources->dwWdTimerDspBase =NULL ;GT_1trace (curTrace,GT_2CLASS ,"dwMemBase[0] 0x%x\n" , pResources->dwMemBase[0 ]);
drivers/dsp/bridge/rmgr/node.c +1 -1
@@ -731,7 +731,7 @@ func_cont2: "0x%x\n", status); } - ulGppMemBase = hostRes.dwMemBase[1 ]; + ulGppMemBase = (u32 )hostRes.dwMemBase[1 ]; offSet = pulValue - dynextBase; ulStackSegAddr = ulGppMemBase + offSet; ulStackSegVal = (u32)*((REG_UWORD32 *)
drivers/dsp/bridge/wmd/_tiomap.h +1 -1
@@ -340,7 +340,7 @@ struct WMD_DEV_CONTEXT {*/ u32 dwDspExtBaseAddr;/* See the comment above */ u32 dwAPIRegBase;/* API memory mapped registers */ -u32 dwDSPMmuBase;/* DSP MMU Mapped registers */ +void __iomem *dwDSPMmuBase;/* DSP MMU Mapped registers */ u32 dwMailBoxBase;/* Mail box mapped registers */ u32 dwAPIClkBase;/* CLK Registers */ u32 dwDSPClkM2Base;/* DSP Clock Module m2 */
drivers/dsp/bridge/wmd/tiomap3430.c +24 -25
105 lines not on this page · raw message
Signature · 1 line
1.6.2.4
PATCH 6/14 DSPBRIDGE: Remove variables not used in cfgdefs.h
From: Guzman Lugo Fernando <[email protected]>
This patch removes some variables that are not used.
--- arch/arm/plat-omap/include/dspbridge/cfgdefs.h | 10 ---------- drivers/dsp/bridge/rmgr/drv.c | 2 -- 2 files changed, 0 insertions(+), 12 deletions(-)
arch/arm/plat-omap/include/dspbridge/cfgdefs.h +0 -10
@@ -77,15 +77,6 @@u8 bIRQAttrib;/* IRQ Attribute */ u32 dwOffsetForMonitor;/* The Shared memory starts from * dwMemBase + this offset */ -u32 dwBusType;/* Bus type for this device */ -u32 dwProgBase;/* DSP ProgBase */ -u32 dwProgLength;/* DSP ProgBase Length */ -u32 dwRegBase;/* DSP memory mapped register base */ -u32 dwRegLength;/* DSP Register Base Length */ -u32 ClientHandle;/* Client Handle */ -u32 SocketHandle;/* Socket and Function Pair */ -u32 CardInfo;/* This will be used as a context data in -* in the CardRequestIRQ */ /* * Info needed by NODE for allocating channels to communicate with RMS: * dwChnlOffset: Offset of RMS channels. Lower channels are
@@ -104,7 +95,6 @@void __iomem *dwWdTimerDspBase;void __iomem *dwMboxBase;void __iomem *dwDmmuBase; -u32 *dwDipiBase;void __iomem *dwSysCtrlBase; } ;
drivers/dsp/bridge/rmgr/drv.c +0 -2
@@ -1736,7 +1736,6 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, s32 bRequest)/* Second window is for DSP external memory shared with MPU */ if (DSP_SUCCEEDED (status)) {/* for Linux, these are hard-coded values */ - pResources->dwBusType =0 ; pResources->bIRQRegisters =0 ; pResources->bIRQAttrib =0 ; pResources->dwOffsetForMonitor =0 ;
@@ -1863,7 +1862,6 @@ static DSP_STATUS RequestBridgeResourcesDSP(u32 dwContext, s32 bRequest) }if (DSP_SUCCEEDED (status)) {/* for Linux, these are hard-coded values */ - pResources->dwBusType =0 ; pResources->bIRQRegisters =0 ; pResources->bIRQAttrib =0 ; pResources->dwOffsetForMonitor =0 ;
Signature · 1 line
1.6.2.4
PATCH 7/14 DSPBRIDGE: base image reload suppor after DSP error
From: Fernando Guzman Lugo <[email protected]>
Added support for reloading the base image after DSP error
--- arch/arm/plat-omap/include/dspbridge/wmddeh.h | 2 + drivers/dsp/bridge/rmgr/node.c | 72 +++++++------ drivers/dsp/bridge/rmgr/proc.c | 153 +++++++++++++++++++------ drivers/dsp/bridge/wmd/ue_deh.c | 37 +++++- 4 files changed, 188 insertions(+), 76 deletions(-)
arch/arm/plat-omap/include/dspbridge/wmddeh.h +2 -0
@@ -61,4 +61,6 @@extern void WMD_DEH_Notify (struct DEH_MGR *hDehMgr,u32 ulEventMask,u32 dwErrInfo); + +extern void WMD_DEH_ReleaseDummyMem (void );#endif /* WMDDEH_ */
drivers/dsp/bridge/rmgr/node.c +39 -33
158 lines not on this page · raw message
drivers/dsp/bridge/rmgr/proc.c +117 -36
290 lines not on this page · raw message
drivers/dsp/bridge/wmd/ue_deh.c +30 -7
@@ -74,6 +74,8 @@ static struct HW_MMUMapAttrs_t mapAttrs = { HW_LITTLE_ENDIAN,HW_ELEM_SIZE_16BIT , HW_MMU_CPUES} ;#define VirtToPhys (x) ((x) - PAGE_OFFSET + PHYS_OFFSET) + +static u32 dummyVaAddr;/* * ======== WMD_DEH_Create ======== * Creates DEH manager object.
@@ -94,6 +96,7 @@ DSP_STATUS WMD_DEH_Create(OUT struct DEH_MGR **phDehMgr,/* Get WMD context info. */ DEV_GetWMDContext (hDevObject, &hWmdContext);DBC_Assert (hWmdContext); + dummyVaAddr =0 ;/* Allocate IO manager object: */ MEM_AllocObject(pDehMgr, struct DEH_MGR, SIGNATURE);if (pDehMgr ==NULL ) {
@@ -151,6 +154,8 @@ DSP_STATUS WMD_DEH_Destroy(struct DEH_MGR *hDehMgr)DBG_Trace (DBG_LEVEL1 ,"Entering DEH_Destroy: 0x%x\n" , pDehMgr);if (MEM_IsValidHandle (pDehMgr,SIGNATURE )) { +/* Release dummy VA buffer */ +WMD_DEH_ReleaseDummyMem ();/* If notification object exists, delete it */ if (pDehMgr->hNtfy) (void )NTFY_Delete (pDehMgr->hNtfy);
@@ -202,7 +207,6 @@ void WMD_DEH_Notify(struct DEH_MGR *hDehMgr, u32 ulEventMask,u32 HW_MMU_MAX_TLB_COUNT =31 ;u32 extern faultAddr;struct CFG_HOSTRES resources; -u32 dummyVaAddr;HW_STATUS hwStatus; status = CFG_GetHostResources(
@@ -246,12 +250,9 @@ void WMD_DEH_Notify(struct DEH_MGR *hDehMgr, u32 ulEventMask, "address = 0x%x\n", (unsigned int)faultAddr); dummyVaAddr = (u32 )MEM_Calloc (sizeof (char ) *0x1000 ,MEM_PAGED ); - memPhysical = (u32 )MEM_Calloc (sizeof (char ) *0x1000 , -MEM_PAGED ); - dummyVaAddr =PG_ALIGN_LOW ((u32 )dummyVaAddr, -PG_SIZE_4K ); - memPhysical =VirtToPhys (dummyVaAddr); -DBG_Trace (DBG_LEVEL6 ,"WMD_DEH_Notify: DSP_MMUFAULT, " + memPhysical =VirtToPhys (PG_ALIGN_LOW ((u32 )dummyVaAddr, +PG_SIZE_4K )); +DBG_Trace (DBG_LEVEL6 ,"WMD_DEH_Notify: DSP_MMUFAULT, " "mem Physical= 0x%x\n" , memPhysical); pDevContext = (struct WMD_DEV_CONTEXT *) pDehMgr->hWmdContext;
@@ -288,6 +289,14 @@ void WMD_DEH_Notify(struct DEH_MGR *hDehMgr, u32 ulEventMask, }/* Filter subsequent notifications when an error occurs */ +if (pDevContext->dwBrdState !=BRD_ERROR ) { +/* Use it as a flag to send notifications the +* first time and error occurred, next time +* state will be BRD_ERROR */ + status1 =DSP_EFAIL ; + } + +/* Filter subsequent notifications when an error occurs */ if (pDevContext->dwBrdState !=BRD_ERROR ) status1 =DSP_SOK ;
@@ -336,3 +345,17 @@ DSP_STATUS WMD_DEH_GetInfo(struct DEH_MGR *hDehMgr,return status; } + + +/* +* ======== WMD_DEH_ReleaseDummyMem ======== +* Releases memory allocated for dummy page +*/ +void WMD_DEH_ReleaseDummyMem (void ) +{ +if (dummyVaAddr) { +MEM_Free ((void *)dummyVaAddr); + dummyVaAddr =0 ; + } +} +
Signature · 1 line
1.6.2.4
PATCH 8/14 DSPBRIDGE: trivial spacing cleanup for memory module
From: Omar Ramirez Luna <[email protected]>
trivial spacing cleanup for memory module
--- drivers/dsp/bridge/services/mem.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-)
drivers/dsp/bridge/services/mem.c +13 -13
@@ -281,11 +281,11 @@ void *MEM_Alloc(u32 cBytes, enum MEM_POOLATTRS type)/* If non-paged memory required, see note at top of file. */ case MEM_PAGED :#ifndef MEM_CHECK - pMem =kmalloc (cBytes, - (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL ); + pMem =kmalloc (cBytes, + (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL );#else pMem =kmalloc (cBytes +sizeof (struct memInfo ), - (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL ); + (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL );if (pMem) { pMem->size = cBytes; pMem->caller =__builtin_return_address (0 );
@@ -304,12 +304,12 @@ void *MEM_Alloc(u32 cBytes, enum MEM_POOLATTRS type)case MEM_LARGEVIRTMEM :#ifndef MEM_CHECK /* FIXME - Replace with 'vmalloc' after BP fix */ - pMem =__vmalloc (cBytes, - (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL ,PAGE_KERNEL ); + pMem =__vmalloc (cBytes, + (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL ,PAGE_KERNEL );#else /* FIXME - Replace with 'vmalloc' after BP fix */ pMem =__vmalloc ((cBytes +sizeof (struct memInfo )), - (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL ,PAGE_KERNEL ); + (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL ,PAGE_KERNEL );if (pMem) { pMem->size = cBytes; pMem->caller =__builtin_return_address (0 );
@@ -359,7 +359,7 @@ void *MEM_AllocPhysMem(u32 cBytes, u32 ulAlign, OUT u32 *pPhysicalAddress) (u32 *)&paMem); }else pVaMem =dma_alloc_coherent (NULL , cBytes, &paMem, - (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL ); + (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL );if (pVaMem ==NULL ) { *pPhysicalAddress =0 ; GT_1trace(MEM_debugMask, GT_6CLASS,
@@ -391,14 +391,14 @@ void *MEM_Calloc(u32 cBytes, enum MEM_POOLATTRS type)/* If non-paged memory required, see note at top of file. */ case MEM_PAGED :#ifndef MEM_CHECK - pMem =kmalloc (cBytes, - (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL ); + pMem =kmalloc (cBytes, + (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL );if (pMem)memset (pMem,0 , cBytes);#else pMem =kmalloc (cBytes +sizeof (struct memInfo ), - (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL ); + (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL );if (pMem) {memset ((void *)((u32 )pMem +sizeof (struct memInfo )),0 , cBytes);
@@ -417,15 +417,15 @@ void *MEM_Calloc(u32 cBytes, enum MEM_POOLATTRS type)case MEM_LARGEVIRTMEM :#ifndef MEM_CHECK /* FIXME - Replace with 'vmalloc' after BP fix */ - pMem =__vmalloc (cBytes, - (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL ,PAGE_KERNEL ); + pMem =__vmalloc (cBytes, + (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL ,PAGE_KERNEL );if (pMem)memset (pMem,0 , cBytes);#else /* FIXME - Replace with 'vmalloc' after BP fix */ pMem =__vmalloc (cBytes +sizeof (struct memInfo ), - (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL ,PAGE_KERNEL ); + (in_atomic ()) ?GFP_ATOMIC :GFP_KERNEL ,PAGE_KERNEL );if (pMem) {memset ((void *)((u32 )pMem +sizeof (struct memInfo )),0 , cBytes);
Signature · 1 line
1.6.2.4
PATCH 9/14 DSPBRIDGE: Fixing indentation
From: Omar Ramirez Luna <[email protected]>
Trivial patch to change spaces for tabs, and a proper indentation
--- drivers/dsp/bridge/wmd/tiomap3430.c | 280 +++++++++++----------- drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 402 +++++++++++++++--------------- 2 files changed, 337 insertions(+), 345 deletions(-)
drivers/dsp/bridge/wmd/tiomap3430.c +136 -144
@@ -188,7 +188,6 @@ struct PgTableAttrs {*/ extern s32 dsp_debug; -/* * This mini driver's function interface table. */
@@ -246,7 +245,7 @@ static struct WMD_DRV_INTERFACE drvInterfaceFxns = {static inline void tlb_flush_all (const void __iomem *base) { -__raw_writeb (__raw_readb (base +MMU_GFLUSH ) |1 , base +MMU_GFLUSH ); +__raw_writeb (__raw_readb (base +MMU_GFLUSH ) |1 , base +MMU_GFLUSH ); }static inline void flush_all (struct WMD_DEV_CONTEXT *pDevContext)
@@ -254,7 +253,8 @@ static inline void flush_all(struct WMD_DEV_CONTEXT *pDevContext)struct CFG_HOSTRES resources;u32 temp =0 ; -CFG_GetHostResources ((struct CFG_DEVNODE *)DRV_GetFirstDevExtension (), &resources); +CFG_GetHostResources ((struct CFG_DEVNODE *)DRV_GetFirstDevExtension (), + &resources);HW_PWRST_IVA2RegGet (resources.dwPrmBase, &temp); if ((temp & HW_PWR_STATE_ON) == HW_PWR_STATE_OFF ||
@@ -291,9 +291,9 @@ void WMD_DRV_Entry(OUT struct WMD_DRV_INTERFACE **ppDrvInterface,DBC_Require (pstrWMDFileName !=NULL );DBG_Trace (DBG_ENTER ,"In the WMD_DRV_Entry \n" ); -IO_SM_init ();/* Initialization of io_sm module */ +IO_SM_init ();/* Initialization of io_sm module */ -if (strcmp (pstrWMDFileName,"UMA" ) ==0 ) +if (strcmp (pstrWMDFileName,"UMA" ) ==0 ) *ppDrvInterface = &drvInterfaceFxns;else DBG_Trace (DBG_LEVEL7 ,"WMD_DRV_Entry Unknown WMD file name" );
@@ -325,20 +325,19 @@ static DSP_STATUS WMD_BRD_Monitor(struct WMD_DEV_CONTEXT *hDevContext)GetHWRegs (resources.dwPrmBase, resources.dwCmBase);HW_PWRST_IVA2RegGet (resources.dwPrmBase, &temp); -if ((temp &0x03 ) !=0x03 || (temp &0x03 ) !=0x02 ) { +if ((temp &0x03 ) !=0x03 || (temp &0x03 ) !=0x02 ) {/* IVA2 is not in ON state */ /* Read and set PM_PWSTCTRL_IVA2 to ON */ HW_PWR_IVA2PowerStateSet (resources.dwPrmBase,HW_PWR_DOMAIN_DSP ,HW_PWR_STATE_ON );/* Set the SW supervised state transition */ -HW_PWR_CLKCTRL_IVA2RegSet (resources.dwCmBase, -HW_SW_SUP_WAKEUP ); +HW_PWR_CLKCTRL_IVA2RegSet (resources.dwCmBase,HW_SW_SUP_WAKEUP );/* Wait until the state has moved to ON */ HW_PWR_IVA2StateGet (resources.dwPrmBase,HW_PWR_DOMAIN_DSP , &pwrState);/* Disable Automatic transition */ -HW_PWR_CLKCTRL_IVA2RegSet (resources.dwCmBase,HW_AUTOTRANS_DIS ); +HW_PWR_CLKCTRL_IVA2RegSet (resources.dwCmBase,HW_AUTOTRANS_DIS ); }DBG_Trace (DBG_LEVEL6 ,"WMD_BRD_Monitor - Middle ****** \n" );GetHWRegs (resources.dwPrmBase, resources.dwCmBase);
@@ -347,7 +346,6 @@ static DSP_STATUS WMD_BRD_Monitor(struct WMD_DEV_CONTEXT *hDevContext)if (DSP_SUCCEEDED (status)) {/* set the device state to IDLE */ pDevContext->dwBrdState =BRD_IDLE ; - } error_return:DBG_Trace (DBG_LEVEL6 ,"WMD_BRD_Monitor - End ****** \n" );
@@ -449,7 +447,7 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext,DBG_Trace (DBG_ENTER ,"Entering WMD_BRD_Start:\n hDevContext: 0x%x\n\t " "dwDSPAddr: 0x%x\n" , hDevContext, dwDSPAddr); -/* The device context contains all the mmu setup info from when the +/* The device context contains all the mmu setup info from when the * last dsp base image was loaded. The first entry is always * SHMMEM base. */ /* Get SHM_BEG - convert to byte address */
@@ -518,23 +516,23 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext,for (iEntryNdx =0 ; iEntryNdx <WMDIOCTL_NUMOFMMUTLB ; iEntryNdx++) {if ((pDevContext->aTLBEntry[iEntryNdx].ulGppPa !=0 ) && - (pDevContext->aTLBEntry[iEntryNdx].ulDspVa !=0 )) { + (pDevContext->aTLBEntry[iEntryNdx].ulDspVa !=0 )) {DBG_Trace (DBG_LEVEL4 ,"** (proc) MMU %d GppPa:" -" 0x%x DspVa 0x%x Size 0x%x\n" , - itmpEntryNdx, - pDevContext->aTLBEntry[iEntryNdx].ulGppPa, - pDevContext->aTLBEntry[iEntryNdx].ulDspVa, - pDevContext->aTLBEntry[iEntryNdx].ulSize); +" 0x%x DspVa 0x%x Size 0x%x\n" , + itmpEntryNdx, + pDevContext->aTLBEntry[iEntryNdx].ulGppPa, + pDevContext->aTLBEntry[iEntryNdx].ulDspVa, + pDevContext->aTLBEntry[iEntryNdx].ulSize);configureDspMmu (pDevContext, - pDevContext->aTLBEntry[iEntryNdx].ulGppPa, - pDevContext->aTLBEntry[iEntryNdx].ulDspVa * -DSPWORDSIZE , - pDevContext->aTLBEntry[iEntryNdx].ulSize, - itmpEntryNdx, - pDevContext->aTLBEntry[iEntryNdx].endianism, - pDevContext->aTLBEntry[iEntryNdx].elemSize, - pDevContext->aTLBEntry[iEntryNdx]. - mixedMode); + pDevContext->aTLBEntry[iEntryNdx].ulGppPa, + pDevContext->aTLBEntry[iEntryNdx].ulDspVa * +DSPWORDSIZE , + pDevContext->aTLBEntry[iEntryNdx].ulSize, + itmpEntryNdx, + pDevContext->aTLBEntry[iEntryNdx].endianism, + pDevContext->aTLBEntry[iEntryNdx].elemSize, + pDevContext->aTLBEntry[iEntryNdx]. + mixedMode); itmpEntryNdx++; } }/* end for */
@@ -575,13 +573,13 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, uClkCmd = (BPWR_DisableClock <<MBX_PM_CLK_CMDSHIFT ) | ulLoadMonitorTimer;DBG_Trace (DBG_LEVEL7 , -"encoded LoadMonitor cmd for Disable: 0x%x\n" , - uClkCmd); +"encoded LoadMonitor cmd for Disable: 0x%x\n" , + uClkCmd);DSPPeripheralClkCtrl (pDevContext, &uClkCmd); extClkId = uClkCmd &MBX_PM_CLK_IDMASK ;for (tmpIndex =0 ; tmpIndex <MBX_PM_MAX_RESOURCES ; - tmpIndex++) { + tmpIndex++) {if (extClkId ==BPWR_CLKID [tmpIndex]) { clkIdIndex = tmpIndex;break ;
@@ -649,7 +647,7 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, }else {DBG_Trace (DBG_LEVEL7 , -"Not able to get the symbol for BIOS Timer\n" ); +"Not able to get the symbol for BIOS Timer\n" ); } }
@@ -657,12 +655,12 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext,/* Set the DSP clock rate */ (void )DEV_GetSymbol (pDevContext->hDevObject,"_BRIDGEINIT_DSP_FREQ" , &ulDspClkAddr); -/*Set Autoidle Mode for IVA2 PLL */ - temp = (u32) *((REG_UWORD32 *) - ((u32) (resources.dwCmBase) +0x34 )); - temp = (temp &0xFFFFFFFE ) |0x1 ; - *((REG_UWORD32 *) ((u32) (resources.dwCmBase) +0x34 )) = - (u32 ) temp; +/*Set Autoidle Mode for IVA2 PLL */ + temp = (u32) *((REG_UWORD32 *) + ((u32) (resources.dwCmBase) +0x34 )); + temp = (temp &0xFFFFFFFE ) |0x1 ; + *((REG_UWORD32 *) ((u32) (resources.dwCmBase) +0x34 )) = + (u32 ) temp;DBG_Trace (DBG_LEVEL5 ,"WMD_BRD_Start: _BRIDGE_DSP_FREQ Addr:" "0x%x \n" , ulDspClkAddr);if ((unsigned int *)ulDspClkAddr !=NULL ) {
@@ -676,32 +674,31 @@ static DSP_STATUS WMD_BRD_Start(struct WMD_DEV_CONTEXT *hDevContext, ulDspClkAddr, sizeof(u32), 0); }/*PM_IVA2GRPSEL_PER = 0xC0;*/ - temp = (u32) *((REG_UWORD32 *) - ((u32) (resources.dwPerPmBase) +0xA8 )); - temp = (temp &0xFFFFFF30 ) |0xC0 ; - *((REG_UWORD32 *) ((u32) (resources.dwPerPmBase) +0xA8 )) = - (u32 ) temp; + temp = (u32) *((REG_UWORD32 *) + ((u32) (resources.dwPerPmBase) +0xA8 )); + temp = (temp &0xFFFFFF30 ) |0xC0 ; + *((REG_UWORD32 *) ((u32) (resources.dwPerPmBase) +0xA8 )) = + (u32 ) temp;/*PM_MPUGRPSEL_PER &= 0xFFFFFF3F;*/ - temp = (u32) *((REG_UWORD32 *) - ((u32) (resources.dwPerPmBase) +0xA4 )); - temp = (temp &0xFFFFFF3F ); - *((REG_UWORD32 *) ((u32) (resources.dwPerPmBase) +0xA4 )) = - (u32 ) temp; + temp = (u32) *((REG_UWORD32 *) + ((u32) (resources.dwPerPmBase) +0xA4 )); + temp = (temp &0xFFFFFF3F ); + *((REG_UWORD32 *) ((u32) (resources.dwPerPmBase) +0xA4 )) = + (u32 ) temp;/*CM_SLEEPDEP_PER |= 0x04;*/ - temp = (u32) *((REG_UWORD32 *) - ((u32) (resources.dwPerBase) +0x44 )); - temp = (temp &0xFFFFFFFB ) |0x04 ; - *((REG_UWORD32 *) ((u32) (resources.dwPerBase) +0x44 )) = - (u32 ) temp; + temp = (u32) *((REG_UWORD32 *) + ((u32) (resources.dwPerBase) +0x44 )); + temp = (temp &0xFFFFFFFB ) |0x04 ; + *((REG_UWORD32 *) ((u32) (resources.dwPerBase) +0x44 )) = + (u32 ) temp;/*CM_CLKSTCTRL_IVA2 = 0x00000003 -To Allow automatic transitions*/ - temp = (u32) *((REG_UWORD32 *) - ((u32) (resources.dwCmBase) +0x48 )); - temp = (temp &0xFFFFFFFC ) |0x03 ; - *((REG_UWORD32 *) ((u32) (resources.dwCmBase) +0x48 )) = - (u32 ) temp; - + temp = (u32) *((REG_UWORD32 *) + ((u32) (resources.dwCmBase) +0x48 )); + temp = (temp &0xFFFFFFFC ) |0x03 ; + *((REG_UWORD32 *) ((u32) (resources.dwCmBase) +0x48 )) = + (u32 ) temp;/* Enable Mailbox events and also drain any pending * stale messages */
@@ -811,16 +808,11 @@ static DSP_STATUS WMD_BRD_Stop(struct WMD_DEV_CONTEXT *hDevContext)HW_PWRST_IVA2RegGet (resources.dwPrmBase, &dspPwrState);if (dspPwrState !=HW_PWR_STATE_OFF ) { - -CHNLSM_InterruptDSP2 (pDevContext,MBX_PM_DSPIDLE ); - -mdelay (10 ); - -GetHWRegs (resources.dwPrmBase, resources.dwCmBase); - +CHNLSM_InterruptDSP2 (pDevContext,MBX_PM_DSPIDLE ); +mdelay (10 ); +GetHWRegs (resources.dwPrmBase, resources.dwCmBase);run_IdleBoot (resources.dwPrmBase, resources.dwCmBase, - resources.dwSysCtrlBase); - + resources.dwSysCtrlBase);udelay (50 ); clk_status =CLK_Disable (SERVICESCLK_iva2_ck);
@@ -828,15 +820,14 @@ static DSP_STATUS WMD_BRD_Stop(struct WMD_DEV_CONTEXT *hDevContext)DBG_Trace (DBG_LEVEL6 ,"\n WMD_BRD_Stop: CLK_Disable failed " "for iva2_fck\n" ); - } + }/* IVA2 is not in OFF state */ /* Set PM_PWSTCTRL_IVA2 to OFF */ HW_PWR_IVA2PowerStateSet (resources.dwPrmBase,HW_PWR_DOMAIN_DSP ,HW_PWR_STATE_OFF );/* Set the SW supervised state transition for Sleep */ -HW_PWR_CLKCTRL_IVA2RegSet (resources.dwCmBase, -HW_SW_SUP_SLEEP ); +HW_PWR_CLKCTRL_IVA2RegSet (resources.dwCmBase,HW_SW_SUP_SLEEP ); }else { clk_status =CLK_Disable (SERVICESCLK_iva2_ck);if (DSP_FAILED (clk_status)) {
@@ -861,9 +852,7 @@ static DSP_STATUS WMD_BRD_Stop(struct WMD_DEV_CONTEXT *hDevContext)memset ((u8 *) pPtAttrs->pgInfo,0x00 , (pPtAttrs->L2NumPages *sizeof (struct PageInfo ))); } - -DBG_Trace (DBG_LEVEL6 ,"WMD_BRD_Stop - End ****** \n" ); - +DBG_Trace (DBG_LEVEL6 ,"WMD_BRD_Stop - End ****** \n" );return status; }
@@ -1046,33 +1035,36 @@ static DSP_STATUS WMD_DEV_Create(OUT struct WMD_DEV_CONTEXT **ppDevContext,/* we like to get aligned on L1 table size */ pg_tbl_va = (u32 )MEM_AllocPhysMem (pPtAttrs->L1size, align_size, &pg_tbl_pa); -/* Check if the PA is aligned for us */ -if ((pg_tbl_pa) & (align_size-1 )) { -/* PA not aligned to page table size , -* try with more allocation and align */ -MEM_FreePhysMem ((void *)pg_tbl_va, pg_tbl_pa, pPtAttrs->L1size); -/* we like to get aligned on L1 table size */ - pg_tbl_va = (u32 )MEM_AllocPhysMem ((pPtAttrs->L1size)*2 , - align_size, &pg_tbl_pa); -/* We should be able to get aligned table now */ - pPtAttrs->L1TblAllocPa = pg_tbl_pa; - pPtAttrs->L1TblAllocVa = pg_tbl_va; - pPtAttrs->L1TblAllocSz = pPtAttrs->L1size *2 ; -/* Align the PA to the next 'align' boundary */ - pPtAttrs->L1BasePa = ((pg_tbl_pa) + (align_size-1 )) & - (~(align_size-1 )); - pPtAttrs->L1BaseVa = pg_tbl_va + (pPtAttrs->L1BasePa - - pg_tbl_pa); - }else { -/* We got aligned PA, cool */ - pPtAttrs->L1TblAllocPa = pg_tbl_pa; - pPtAttrs->L1TblAllocVa = pg_tbl_va; - pPtAttrs->L1TblAllocSz = pPtAttrs->L1size; - pPtAttrs->L1BasePa = pg_tbl_pa; - pPtAttrs->L1BaseVa = pg_tbl_va; - } -if (pPtAttrs->L1BaseVa) -memset ((u8 *)pPtAttrs->L1BaseVa,0x00 , pPtAttrs->L1size); + +/* Check if the PA is aligned for us */ +if ((pg_tbl_pa) & (align_size-1 )) { +/* PA not aligned to page table size , +* try with more allocation and align */ +MEM_FreePhysMem ((void *)pg_tbl_va, pg_tbl_pa, + pPtAttrs->L1size); +/* we like to get aligned on L1 table size */ + pg_tbl_va = (u32 )MEM_AllocPhysMem ((pPtAttrs->L1size)*2 , + align_size, &pg_tbl_pa); +/* We should be able to get aligned table now */ + pPtAttrs->L1TblAllocPa = pg_tbl_pa; + pPtAttrs->L1TblAllocVa = pg_tbl_va; + pPtAttrs->L1TblAllocSz = pPtAttrs->L1size *2 ; +/* Align the PA to the next 'align' boundary */ + pPtAttrs->L1BasePa = ((pg_tbl_pa) + (align_size-1 )) & + (~(align_size-1 )); + pPtAttrs->L1BaseVa = pg_tbl_va + (pPtAttrs->L1BasePa - + pg_tbl_pa); + }else { +/* We got aligned PA, cool */ + pPtAttrs->L1TblAllocPa = pg_tbl_pa; + pPtAttrs->L1TblAllocVa = pg_tbl_va; + pPtAttrs->L1TblAllocSz = pPtAttrs->L1size; + pPtAttrs->L1BasePa = pg_tbl_pa; + pPtAttrs->L1BaseVa = pg_tbl_va; + } +if (pPtAttrs->L1BaseVa) +memset ((u8 *)pPtAttrs->L1BaseVa,0x00 , + pPtAttrs->L1size);/* number of L2 page tables = DMM pool used + SHMMEM +EXTMEM + * L4 pages */
@@ -1083,16 +1075,17 @@ static DSP_STATUS WMD_DEV_Create(OUT struct WMD_DEV_CONTEXT **ppDevContext,/* we like to get aligned on L1 table size */ pg_tbl_va = (u32 )MEM_AllocPhysMem (pPtAttrs->L2size, align_size, &pg_tbl_pa); - pPtAttrs->L2TblAllocPa = pg_tbl_pa; - pPtAttrs->L2TblAllocVa = pg_tbl_va; - pPtAttrs->L2TblAllocSz = pPtAttrs->L2size; - pPtAttrs->L2BasePa = pg_tbl_pa; - pPtAttrs->L2BaseVa = pg_tbl_va; + pPtAttrs->L2TblAllocPa = pg_tbl_pa; + pPtAttrs->L2TblAllocVa = pg_tbl_va; + pPtAttrs->L2TblAllocSz = pPtAttrs->L2size; + pPtAttrs->L2BasePa = pg_tbl_pa; + pPtAttrs->L2BaseVa = pg_tbl_va; -if (pPtAttrs->L2BaseVa) -memset ((u8 *)pPtAttrs->L2BaseVa,0x00 , pPtAttrs->L2size); +if (pPtAttrs->L2BaseVa) +memset ((u8 *)pPtAttrs->L2BaseVa,0x00 , + pPtAttrs->L2size); - pPtAttrs->pgInfo =MEM_Calloc (pPtAttrs->L2NumPages * + 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 " "%x, size %x\n", pPtAttrs->L1BasePa,
@@ -1196,7 +1189,6 @@ static DSP_STATUS WMD_DEV_Ctrl(struct WMD_DEV_CONTEXT *pDevContext, u32 dwCmd,/* store away dsp-mmu setup values for later use */ for (ndx =0 ; ndx <WMDIOCTL_NUMOFMMUTLB ; ndx++, paExtProc++) pDevContext->aTLBEntry[ndx] = *paExtProc; -break ;case WMDIOCTL_DEEPSLEEP :case WMDIOCTL_EMERGENCYSLEEP :
@@ -1390,7 +1382,7 @@ static DSP_STATUS WMD_BRD_MemMap(struct WMD_DEV_CONTEXT *hDevContext, hwAttrs.endianism =HW_LITTLE_ENDIAN ; hwAttrs.mixedSize = (enum HW_MMUMixedSize_t ) - ((attrs &DSP_MAPMIXEDELEMSIZE ) >>2 ); + ((attrs &DSP_MAPMIXEDELEMSIZE ) >>2 );/* Ignore elementSize if mixedSize is enabled */ if (hwAttrs.mixedSize ==0 ) {if (attrs &DSP_MAPELEMSIZE8 ) {
@@ -1457,9 +1449,9 @@ static DSP_STATUS WMD_BRD_MemMap(struct WMD_DEV_CONTEXT *hDevContext,/* 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); +"ulNumBytes=%x, vm_start=%x vm_end=%x vm_flags=%x\n" , + ulMpuAddr, ulNumBytes, vma->vm_start, + vma->vm_end, vma->vm_flags); }if (!vma) { DBG_Trace(DBG_LEVEL7, "Failed to get the VMA region for "
@@ -1861,7 +1853,7 @@ static DSP_STATUS PteSet(struct PgTableAttrs *pt, u32 pa, u32 va,u32 pteSize;u32 pgTblVa;/* Base address of the PT that will be updated */ u32 L1BaseVa; -/* Compiler warns that the next three variables might be used +/* Compiler warns that the next three variables might be used * uninitialized in this function. Doesn't seem so. Working around, * anyways. */ u32 L2BaseVa =0 ;
@@ -2035,7 +2027,7 @@ static DSP_STATUS run_IdleBoot(void __iomem *prm_base, void __iomem *cm_base,/* Read PM_PWSTST_IVA2 */ HW_PWRST_IVA2RegGet (prm_base, &temp); -if ((temp &0x03 ) !=0x03 || (temp &0x03 ) !=0x02 ) { +if ((temp &0x03 ) !=0x03 || (temp &0x03 ) !=0x02 ) {/* IVA2 is not in ON state */ /* Set PM_PWSTCTRL_IVA2 to ON */ HW_PWR_IVA2PowerStateSet(prm_base, HW_PWR_DOMAIN_DSP,
@@ -2052,16 +2044,16 @@ static DSP_STATUS run_IdleBoot(void __iomem *prm_base, void __iomem *cm_base,udelay (30 );/* set the SYSC for Idle Boot */ __raw_writel ((u32 )0x01 , (sysctrl_base) +0x404 ); - temp = (u32) *((REG_UWORD32 *) - ((u32) (cm_base) +0x34 )); - temp = (temp &0xFFFFFFFE ) |0x1 ; - *((REG_UWORD32 *) ((u32) (cm_base) +0x34 )) = - (u32 ) temp; - temp = (u32) *((REG_UWORD32 *) - ((u32) (cm_base) +0x4 )); - temp = (temp &0xFFFFFC8 ) |0x37 ; - *((REG_UWORD32 *) ((u32) (cm_base) +0x4 )) = - (u32 ) temp; + temp = (u32) *((REG_UWORD32 *) + ((u32) (cm_base) +0x34 )); + temp = (temp &0xFFFFFFFE ) |0x1 ; + *((REG_UWORD32 *) ((u32) (cm_base) +0x34 )) = + (u32 ) temp; + temp = (u32) *((REG_UWORD32 *) + ((u32) (cm_base) +0x4 )); + temp = (temp &0xFFFFFC8 ) |0x37 ; + *((REG_UWORD32 *) ((u32) (cm_base) +0x4 )) = + (u32 ) temp;CLK_Enable (SERVICESCLK_iva2_ck);udelay (20 );GetHWRegs (prm_base, cm_base);
@@ -2077,26 +2069,26 @@ static DSP_STATUS run_IdleBoot(void __iomem *prm_base, void __iomem *cm_base,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); - temp =__raw_readl ((cm_base) +0x10 ); -DBG_Trace (DBG_LEVEL6 ,"CM_ICLKEN1_IVA2 = 0x%x \n" , temp); - temp =__raw_readl ((cm_base) +0x20 ); -DBG_Trace (DBG_LEVEL6 ,"CM_IDLEST_IVA2 = 0x%x \n" , temp); - temp =__raw_readl ((cm_base) +0x48 ); -DBG_Trace (DBG_LEVEL6 ,"CM_CLKSTCTRL_IVA2 = 0x%x \n" , temp); - temp =__raw_readl ((cm_base) +0x4c ); -DBG_Trace (DBG_LEVEL6 ,"CM_CLKSTST_IVA2 = 0x%x \n" , temp); - temp =__raw_readl ((prm_base) +0x50 ); -DBG_Trace (DBG_LEVEL6 ,"RM_RSTCTRL_IVA2 = 0x%x \n" , temp); - temp =__raw_readl ((prm_base) +0x58 ); -DBG_Trace (DBG_LEVEL6 ,"RM_RSTST_IVA2 = 0x%x \n" , temp); - temp =__raw_readl ((prm_base) +0xE0 ); -DBG_Trace (DBG_LEVEL6 ,"PM_PWSTCTRL_IVA2 = 0x%x \n" , temp); - temp =__raw_readl ((prm_base) +0xE4 ); -DBG_Trace (DBG_LEVEL6 ,"PM_PWSTST_IVA2 = 0x%x \n" , temp); - temp =__raw_readl ((cm_base) +0xA10 ); -DBG_Trace (DBG_LEVEL6 ,"CM_ICLKEN1_CORE = 0x%x \n" , temp); + temp =__raw_readl ((cm_base) +0x00 ); +DBG_Trace (DBG_LEVEL6 ,"CM_FCLKEN_IVA2 = 0x%x \n" , temp); + temp =__raw_readl ((cm_base) +0x10 ); +DBG_Trace (DBG_LEVEL6 ,"CM_ICLKEN1_IVA2 = 0x%x \n" , temp); + temp =__raw_readl ((cm_base) +0x20 ); +DBG_Trace (DBG_LEVEL6 ,"CM_IDLEST_IVA2 = 0x%x \n" , temp); + temp =__raw_readl ((cm_base) +0x48 ); +DBG_Trace (DBG_LEVEL6 ,"CM_CLKSTCTRL_IVA2 = 0x%x \n" , temp); + temp =__raw_readl ((cm_base) +0x4c ); +DBG_Trace (DBG_LEVEL6 ,"CM_CLKSTST_IVA2 = 0x%x \n" , temp); + temp =__raw_readl ((prm_base) +0x50 ); +DBG_Trace (DBG_LEVEL6 ,"RM_RSTCTRL_IVA2 = 0x%x \n" , temp); + temp =__raw_readl ((prm_base) +0x58 ); +DBG_Trace (DBG_LEVEL6 ,"RM_RSTST_IVA2 = 0x%x \n" , temp); + temp =__raw_readl ((prm_base) +0xE0 ); +DBG_Trace (DBG_LEVEL6 ,"PM_PWSTCTRL_IVA2 = 0x%x \n" , temp); + temp =__raw_readl ((prm_base) +0xE4 ); +DBG_Trace (DBG_LEVEL6 ,"PM_PWSTST_IVA2 = 0x%x \n" , temp); + temp =__raw_readl ((cm_base) +0xA10 ); +DBG_Trace (DBG_LEVEL6 ,"CM_ICLKEN1_CORE = 0x%x \n" , temp); }/*
drivers/dsp/bridge/wmd/tiomap3430_pwr.c +201 -201
466 lines not on this page · raw message
Signature · 1 line
1.6.2.4
PATCH 10/14 BRIDGE: Number of supported OPPs increased to 5
From: Armando Uribe de Leon <[email protected]>
This patch increases the supported opp numbers within bridge driver, it will also fix the opp table to be fully populated in the shared memory; before, it was causing the QOS test reported numbers to be inaccurate.
--- drivers/dsp/bridge/rmgr/drv_interface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/dsp/bridge/rmgr/drv_interface.c +1 -1
@@ -210,7 +210,7 @@ static struct file_operations bridge_fops = {static u32 timeOut =1000 ;#ifdef CONFIG_BRIDGE_DVFS static struct clk *clk_handle; -s32 dsp_max_opps =VDD1_OPP3 ; +s32 dsp_max_opps =VDD1_OPP5 ;#endif /* Maximum Opps that can be requested by IVA*/
Signature · 1 line
1.6.2.4
PATCH 11/14 DSPBRIDGE: New PWRERROR event notification
From: Omar Ramirez Luna <[email protected]>
This patch defines a new DSP_PWRERROR event which can be registered for notification. It uses the same mechanism as MMUFAULT or SYSERROR. And will notify to ayn client registered if there was any error when entering forced sleep state.
--- arch/arm/plat-omap/include/dspbridge/dbdefs.h | 7 +++++-- drivers/dsp/bridge/rmgr/proc.c | 11 ++++++----- drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 6 ++++++ drivers/dsp/bridge/wmd/ue_deh.c | 10 ++++++++++ 4 files changed, 27 insertions(+), 7 deletions(-)
arch/arm/plat-omap/include/dspbridge/dbdefs.h +5 -2
@@ -101,6 +101,7 @@#define DSP_MMUFAULT 0x00000010#define DSP_SYSERROR 0x00000020#define DSP_EXCEPTIONABORT 0x00000300 +#define DSP_PWRERROR 0x00000080/* IVA exception events (IVA MMU fault) */ #define IVA_MMUFAULT 0x00000040
@@ -174,7 +175,8 @@DSP_STREAMDONE | \DSP_STREAMIOCOMPLETION | \DSP_MMUFAULT | \ - DSP_SYSERROR)) && \ +DSP_SYSERROR | \ + DSP_PWRERROR)) && \ !((x) & ~(DSP_PROCESSORSTATECHANGE | \ DSP_PROCESSORATTACH | \ DSP_PROCESSORDETACH | \
@@ -183,7 +185,8 @@ DSP_STREAMDONE | \ DSP_STREAMIOCOMPLETION | \ DSP_MMUFAULT | \ - DSP_SYSERROR)))) + DSP_SYSERROR | \ + DSP_PWRERROR))))#define IsValidNodeEvent (x) (((x) == 0) || (((x) & (DSP_NODESTATECHANGE | \ DSP_NODEMESSAGEREADY)) && \
drivers/dsp/bridge/rmgr/proc.c +6 -5
@@ -1499,7 +1499,7 @@ DSP_STATUS PROC_RegisterNotify(DSP_HPROCESSOR hProcessor, u32 uEventMask,/* Check if event mask is a valid processor related event */ if (uEventMask & ~(DSP_PROCESSORSTATECHANGE |DSP_PROCESSORATTACH |DSP_PROCESSORDETACH |DSP_PROCESSORRESTART |DSP_MMUFAULT | -DSP_SYSERROR )) +DSP_SYSERROR |DSP_PWRERROR )) status =DSP_EVALUE ;/* Check if notify type is valid */
@@ -1507,12 +1507,13 @@ DSP_STATUS PROC_RegisterNotify(DSP_HPROCESSOR hProcessor, u32 uEventMask, status =DSP_EVALUE ;if (DSP_SUCCEEDED (status)) { -/* * If event mask is not DSP_SYSERROR or DSP_MMUFAULT, -* then register event immediately. */ -if (uEventMask & ~(DSP_SYSERROR |DSP_MMUFAULT )) { +/* If event mask is not DSP_SYSERROR, DSP_MMUFAULT, +* or DSP_PWRERROR then register event immediately. */ +if (uEventMask & + ~(DSP_SYSERROR |DSP_MMUFAULT |DSP_PWRERROR )) { status =NTFY_Register (pProcObject->hNtfy, hNotification, uEventMask, uNotifyType); -/* * Special case alert, special case alert! +/* Special case alert, special case alert! * If we're trying to *deregister* (i.e. uEventMask * is 0), a DSP_SYSERROR or DSP_MMUFAULT notification, * we have to deregister with the DEH manager.
drivers/dsp/bridge/wmd/tiomap3430_pwr.c +6 -0
@@ -57,6 +57,9 @@#include <dspbridge/pwr_sh.h> +/* ----------------------------------- Mini Driver */ +#include <dspbridge/wmddeh.h> +/* ----------------------------------- specific to this file */ #include "_tiomap.h" #include "_tiomap_pwr.h"
@@ -188,6 +191,7 @@ DSP_STATUS SleepDSP(struct WMD_DEV_CONTEXT *pDevContext, IN u32 dwCmd,DSP_STATUS status =DSP_SOK ;#ifdef CONFIG_PM struct CFG_HOSTRES resources; +struct DEH_MGR *hDehMgr;u16 usCount =TIHELEN_ACKTIMEOUT ;enum HW_PwrState_t pwrState;enum HW_PwrState_t targetPwrState;
@@ -257,6 +261,8 @@ DSP_STATUS SleepDSP(struct WMD_DEV_CONTEXT *pDevContext, IN u32 dwCmd,if (usCount ==0 ) {DBG_Trace (DBG_LEVEL7 ,"SleepDSP: Timed out Waiting for DSP" " STANDBY %x \n" , pwrState); +DEV_GetDehMgr (pDevContext->hDevObject, &hDehMgr); +WMD_DEH_Notify (hDehMgr,DSP_PWRERROR ,0 );return WMD_E_TIMEOUT ; }else { DBG_Trace(DBG_LEVEL7, "SleepDSP: DSP STANDBY Pwr state %x \n",
drivers/dsp/bridge/wmd/ue_deh.c +10 -0
@@ -281,6 +281,16 @@ DBG_Trace(DBG_LEVEL6, "WMD_DEH_Notify: DSP_MMUFAULT, "HW_MMU_EventAck (resources.dwDmmuBase,HW_MMU_TRANSLATION_FAULT );break ; +case DSP_PWRERROR : +/* reset errInfo structure before use */ + pDehMgr->errInfo.dwErrMask =DSP_PWRERROR ; + pDehMgr->errInfo.dwVal1 =0L ; + pDehMgr->errInfo.dwVal2 =0L ; + pDehMgr->errInfo.dwVal3 =0L ; + pDehMgr->errInfo.dwVal1 = dwErrInfo; +printk (KERN_ERR "WMD_DEH_Notify: DSP_PWRERROR, errInfo " +"= 0x%x\n" , dwErrInfo); +break ;default :DBG_Trace (DBG_LEVEL6 , "WMD_DEH_Notify: Unknown Error, errInfo = "
Signature · 1 line
1.6.2.4
PATCH 12/14 DSPBRIDGE: Remove all resources on driver exit
From: Omar Ramirez Luna <[email protected]>
There is no need to walk the process context list on exit, remove all process instead without exception.
--- drivers/dsp/bridge/rmgr/drv_interface.c | 32 +++++------------------------- 1 files changed, 6 insertions(+), 26 deletions(-) mode change 100755 => 100644 drivers/dsp/bridge/rmgr/drv_interface.c
drivers/dsp/bridge/rmgr/drv_interface.c +6 -26
@@ -451,44 +451,24 @@ static int __devexit omap34xx_bridge_remove(struct platform_device *pdev)HANDLE hDrvObject =NULL ;struct PROCESS_CONTEXT *pTmp =NULL ;struct PROCESS_CONTEXT *pCtxtclosed =NULL ; -struct PROCESS_CONTEXT *pCtxttraverse =NULL ;GT_0trace (driverTrace,GT_ENTER ,"-> driver_exit\n" ); dsp_status =CFG_GetObject ((u32 *)&hDrvObject,REG_DRV_OBJECT ); +if (DSP_FAILED (dsp_status)) + goto func_cont;DRV_GetProcCtxtList (&pCtxtclosed, (struct DRV_OBJECT *)hDrvObject);while (pCtxtclosed !=NULL ) { +GT_1trace (driverTrace,GT_5CLASS ,"***Cleanup of " +"process***%d\n" , pCtxtclosed->pid);DRV_RemoveAllResources (pCtxtclosed); -if (pCtxtclosed->hProcessor !=NULL ) { -DRV_GetProcCtxtList (&pCtxttraverse, - (struct DRV_OBJECT *)hDrvObject); -if (pCtxttraverse->next ==NULL ) { -PROC_Detach (pCtxtclosed->hProcessor); - goto func_cont; - } -if ((pCtxtclosed->pid == pCtxttraverse->pid) && - (pCtxttraverse->next !=NULL )) { - pCtxttraverse = pCtxttraverse->next; - } -while ((pCtxttraverse !=NULL ) && - (pCtxtclosed->hProcessor - != pCtxttraverse->hProcessor)) { - pCtxttraverse = pCtxttraverse->next; -if ((pCtxttraverse !=NULL ) && - (pCtxtclosed->pid == pCtxttraverse->pid)) { - pCtxttraverse = pCtxttraverse->next; - } - } -if (pCtxttraverse ==NULL ) -PROC_Detach (pCtxtclosed->hProcessor); - } -func_cont: +PROC_Detach (pCtxtclosed->hProcessor); pTmp = pCtxtclosed->next;DRV_RemoveProcContext ((struct DRV_OBJECT *)hDrvObject, pCtxtclosed, (void *)pCtxtclosed->pid); pCtxtclosed = pTmp; } - +func_cont: /* unregister the clock notifier */#ifdef CONFIG_BRIDGE_DVFS if (!clk_notifier_unregister (clk_handle, &iva_clk_notifier)) {
Signature · 1 line
1.6.2.4
PATCH 13/14 DSPBRIDGE: Stop and reset DSP before removing constraints
From: Omar Ramirez Luna <[email protected]>
This patch implements the DSP Reset procedure to be made on bridge exit before unregistering the constraints set by dsp.
--- drivers/dsp/bridge/rmgr/drv_interface.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-)
drivers/dsp/bridge/rmgr/drv_interface.c +8 -9
@@ -469,6 +469,14 @@ static int __devexit omap34xx_bridge_remove(struct platform_device *pdev) pCtxtclosed = pTmp; } func_cont: +if (driverContext) { +/* Put the DSP in reset state */ + ret =DSP_Deinit (driverContext); + driverContext =0 ; +DBC_Assert (ret == true); + } +SERVICES_Exit (); +GT_exit ();/* unregister the clock notifier */ #ifdef CONFIG_BRIDGE_DVFS if (!clk_notifier_unregister (clk_handle, &iva_clk_notifier)) {
@@ -483,15 +491,6 @@ func_cont: clk_handle =NULL ;#endif /* #ifdef CONFIG_BRIDGE_DVFS */ -if (driverContext) { - ret =DSP_Deinit (driverContext); - driverContext =0 ; - -DBC_Assert (ret == true); - } -SERVICES_Exit (); -GT_exit (); - devno =MKDEV (driver_major, driver_minor);if (bridge_device) {cdev_del (&bridge_device->cdev);
Signature · 1 line
1.6.2.4
PATCH 14/14 DSPBRIDGE: Remove run_IdleBoot support
From: Hari Kanigeri <[email protected]>
Changed the Bridge boot process in order to avoid the usage of the IDLE boot mode and the DSP ROM.
--- drivers/dsp/bridge/wmd/tiomap3430.c | 60 +++------------------------------- 1 files changed, 6 insertions(+), 54 deletions(-)
drivers/dsp/bridge/wmd/tiomap3430.c +6 -54
@@ -141,8 +141,6 @@ static DSP_STATUS PteSet(struct PgTableAttrs *pt, u32 pa, u32 va,static DSP_STATUS MemMapVmalloc (struct WMD_DEV_CONTEXT *hDevContext,u32 ulMpuAddr,u32 ulVirtAddr,u32 ulNumBytes,struct HW_MMUMapAttrs_t *hwAttrs); -static DSP_STATUS run_IdleBoot (void __iomem *prcm_base,void __iomem *cm_base, -void __iomem *sysctrl_base);static void GetHWRegs (void __iomem *prcm_base,void __iomem *cm_base);/* ----------------------------------- Globals */
@@ -341,8 +339,9 @@ static DSP_STATUS WMD_BRD_Monitor(struct WMD_DEV_CONTEXT *hDevContext) }DBG_Trace (DBG_LEVEL6 ,"WMD_BRD_Monitor - Middle ****** \n" );GetHWRegs (resources.dwPrmBase, resources.dwCmBase); - status =run_IdleBoot (resources.dwPrmBase, resources.dwCmBase, - resources.dwSysCtrlBase); +HW_RST_UnReset (resources.dwPrmBase,HW_RST2_IVA2 ); +CLK_Enable (SERVICESCLK_iva2_ck); +if (DSP_SUCCEEDED (status)) {/* set the device state to IDLE */ pDevContext->dwBrdState =BRD_IDLE ;
@@ -811,8 +810,6 @@ static DSP_STATUS WMD_BRD_Stop(struct WMD_DEV_CONTEXT *hDevContext)CHNLSM_InterruptDSP2 (pDevContext,MBX_PM_DSPIDLE );mdelay (10 );GetHWRegs (resources.dwPrmBase, resources.dwCmBase); -run_IdleBoot (resources.dwPrmBase, resources.dwCmBase, - resources.dwSysCtrlBase);udelay (50 ); clk_status =CLK_Disable (SERVICESCLK_iva2_ck);
@@ -916,6 +913,9 @@ static DSP_STATUS WMD_BRD_Delete(struct WMD_DEV_CONTEXT *hDevContext) (pPtAttrs->L2NumPages * sizeof(struct PageInfo))); }DBG_Trace (DBG_LEVEL6 ,"WMD_BRD_Stop - End ****** \n" ); +HW_RST_Reset (resources.dwPrmBase,HW_RST1_IVA2 ); +HW_RST_Reset (resources.dwPrmBase,HW_RST2_IVA2 ); +return status; }
@@ -2018,54 +2018,6 @@ static DSP_STATUS MemMapVmalloc(struct WMD_DEV_CONTEXT *pDevContext,return status; } -static DSP_STATUS run_IdleBoot (void __iomem *prm_base,void __iomem *cm_base, -void __iomem *sysctrl_base) -{ -u32 temp; -DSP_STATUS status =DSP_SOK ; -enum HW_PwrState_t pwrState; - -/* Read PM_PWSTST_IVA2 */ -HW_PWRST_IVA2RegGet (prm_base, &temp); -if ((temp &0x03 ) !=0x03 || (temp &0x03 ) !=0x02 ) { -/* IVA2 is not in ON state */ -/* Set PM_PWSTCTRL_IVA2 to ON */ -HW_PWR_IVA2PowerStateSet (prm_base,HW_PWR_DOMAIN_DSP , -HW_PWR_STATE_ON ); -/* Set the SW supervised state transition */ -HW_PWR_CLKCTRL_IVA2RegSet (cm_base,HW_SW_SUP_WAKEUP ); -/* Wait until the state has moved to ON */ -HW_PWR_IVA2StateGet (prm_base,HW_PWR_DOMAIN_DSP , &pwrState); - } -CLK_Disable (SERVICESCLK_iva2_ck); -udelay (10 ); -/* Assert IVA2-RST1 and IVA2-RST2 */ -__raw_writel ((u32 )0x07 , (prm_base) +0x50 ); -udelay (30 ); -/* set the SYSC for Idle Boot */ -__raw_writel ((u32 )0x01 , (sysctrl_base) +0x404 ); - temp = (u32) *((REG_UWORD32 *) - ((u32) (cm_base) +0x34 )); - temp = (temp &0xFFFFFFFE ) |0x1 ; - *((REG_UWORD32 *) ((u32) (cm_base) +0x34 )) = - (u32 ) temp; - temp = (u32) *((REG_UWORD32 *) - ((u32) (cm_base) +0x4 )); - temp = (temp &0xFFFFFC8 ) |0x37 ; - *((REG_UWORD32 *) ((u32) (cm_base) +0x4 )) = - (u32 ) temp; -CLK_Enable (SERVICESCLK_iva2_ck); -udelay (20 ); -GetHWRegs (prm_base, cm_base); -/* Release Reset1 and Reset2 */ -__raw_writel ((u32 )0x05 , (prm_base) +0x50 ); -udelay (20 ); -__raw_writel ((u32 )0x04 , (prm_base) +0x50 ); -udelay (30 ); -return status; -} - -static void GetHWRegs (void __iomem *prm_base,void __iomem *cm_base) {u32 temp;
Signature · 1 line
1.6.2.4
Quoted 3 lines · Omar Ramirez Luna
From: Guzman Lugo Fernando <[email protected]>
This patch removes the SEEK_* redefinitions in
host_os.h
Nice patchset but a cover letter would make them even nicer :)
Signature · 1 line
Felipe Contreras
Quoted 9 lines
From: linux-omap On Behalf Of Felipe Contreras
Sent: Wednesday, May 20, 2009 8:43 AMQuoted 3 lines · Omar Ramirez Luna
From: Guzman Lugo Fernando <[email protected]>
This patch removes the SEEK_* redefinitions in
host_os.hNice patchset but a cover letter would make them even nicer :)
I'll keep that in mind, thanks for the suggestion.
- omar