AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-30 12:36:41 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: tidspbridge: ioremap dsp sync addr

Browse Source 
Change the type of sync_addr to 'void __iomem *' and ioremap the
physical address in the shared memory so we can access it using
_raw_*. While at it, drop 'dw_' prefix.

Fix the warning associated with dsp's sync_addr:

warning: passing argument 2 of '__raw_writel' makes pointer from integer without a cast
../io.h:88: note: expected 'volatile void *' but argument is of type 'u32'

Signed-off-by: Omar Ramirez Luna <omar.ramirez@copitl.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Omar Ramirez Luna 2012-10-24 17:09:18 -05:00 committed by Greg Kroah-Hartman
parent 3c8676967b
commit 7de8a0cf48
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/staging/tidspbridge/core/tiomap3430.c
View File

@ -126,7 +126,8 @@ static int mem_map_vmalloc(struct bridge_dev_context *dev_context,
u32 ul_num_bytes, u32 ul_num_bytes,
struct hw_mmu_map_attrs_t *hw_attrs); struct hw_mmu_map_attrs_t *hw_attrs);
bool wait_for_start(struct bridge_dev_context *dev_context, u32 dw_sync_addr); bool wait_for_start(struct bridge_dev_context *dev_context,
void __iomem *sync_addr);
/* ----------------------------------- Globals */ /* ----------------------------------- Globals */
@ -363,10 +364,11 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt,
{ {
int status = 0; int status = 0;
struct bridge_dev_context *dev_context = dev_ctxt; struct bridge_dev_context *dev_context = dev_ctxt;
u32 dw_sync_addr = 0; void __iomem *sync_addr;
u32 ul_shm_base; /* Gpp Phys SM base addr(byte) */ u32 ul_shm_base; /* Gpp Phys SM base addr(byte) */
u32 ul_shm_base_virt; /* Dsp Virt SM base addr */ u32 ul_shm_base_virt; /* Dsp Virt SM base addr */
u32 ul_tlb_base_virt; /* Base of MMU TLB entry */ u32 ul_tlb_base_virt; /* Base of MMU TLB entry */
u32 shm_sync_pa;
/* Offset of shm_base_virt from tlb_base_virt */ /* Offset of shm_base_virt from tlb_base_virt */
u32 ul_shm_offset_virt; u32 ul_shm_offset_virt;
s32 entry_ndx; s32 entry_ndx;
@ -397,15 +399,22 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt,
/* Kernel logical address */ /* Kernel logical address */
ul_shm_base = dev_context->atlb_entry[0].gpp_va + ul_shm_offset_virt; ul_shm_base = dev_context->atlb_entry[0].gpp_va + ul_shm_offset_virt;
/* SHM physical sync address */
shm_sync_pa = dev_context->atlb_entry[0].gpp_pa + ul_shm_offset_virt +
SHMSYNCOFFSET;
/* 2nd wd is used as sync field */ /* 2nd wd is used as sync field */
dw_sync_addr = ul_shm_base + SHMSYNCOFFSET; sync_addr = ioremap(shm_sync_pa, SZ_32);
if (!sync_addr)
return -ENOMEM;
/* Write a signature into the shm base + offset; this will /* Write a signature into the shm base + offset; this will
* get cleared when the DSP program starts. */ * get cleared when the DSP program starts. */
if ((ul_shm_base_virt == 0) || (ul_shm_base == 0)) { if ((ul_shm_base_virt == 0) || (ul_shm_base == 0)) {
pr_err("%s: Illegal SM base\n", __func__); pr_err("%s: Illegal SM base\n", __func__);
status = -EPERM; status = -EPERM;
} else } else
__raw_writel(0xffffffff, dw_sync_addr); __raw_writel(0xffffffff, sync_addr);
if (!status) { if (!status) {
resources = dev_context->resources; resources = dev_context->resources;
@ -419,8 +428,10 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt,
* function is made available. * function is made available.
*/ */
void __iomem *ctrl = ioremap(0x48002000, SZ_4K); void __iomem *ctrl = ioremap(0x48002000, SZ_4K);
if (!ctrl) if (!ctrl) {
iounmap(sync_addr);
return -ENOMEM; return -ENOMEM;
}
(*pdata->dsp_prm_rmw_bits)(OMAP3430_RST1_IVA2_MASK, (*pdata->dsp_prm_rmw_bits)(OMAP3430_RST1_IVA2_MASK,
OMAP3430_RST1_IVA2_MASK, OMAP3430_IVA2_MOD, OMAP3430_RST1_IVA2_MASK, OMAP3430_IVA2_MOD,
@ -588,15 +599,15 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt,
(*pdata->dsp_prm_rmw_bits)(OMAP3430_RST1_IVA2_MASK, 0, (*pdata->dsp_prm_rmw_bits)(OMAP3430_RST1_IVA2_MASK, 0,
OMAP3430_IVA2_MOD, OMAP2_RM_RSTCTRL); OMAP3430_IVA2_MOD, OMAP2_RM_RSTCTRL);
dev_dbg(bridge, "Waiting for Sync @ 0x%x\n", dw_sync_addr); dev_dbg(bridge, "Waiting for Sync @ 0x%x\n", *(u32 *)sync_addr);
dev_dbg(bridge, "DSP c_int00 Address = 0x%x\n", dsp_addr); dev_dbg(bridge, "DSP c_int00 Address = 0x%x\n", dsp_addr);
if (dsp_debug) if (dsp_debug)
while (__raw_readw(dw_sync_addr)) while (__raw_readw(sync_addr))
; ;
/* Wait for DSP to clear word in shared memory */ /* Wait for DSP to clear word in shared memory */
/* Read the Location */ /* Read the Location */
if (!wait_for_start(dev_context, dw_sync_addr)) if (!wait_for_start(dev_context, sync_addr))
status = -ETIMEDOUT; status = -ETIMEDOUT;
dev_get_symbol(dev_context->dev_obj, "_WDT_enable", &wdt_en); dev_get_symbol(dev_context->dev_obj, "_WDT_enable", &wdt_en);
@ -612,7 +623,7 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt,
/* Write the synchronization bit to indicate the /* Write the synchronization bit to indicate the
* completion of OPP table update to DSP * completion of OPP table update to DSP
*/ */
__raw_writel(0XCAFECAFE, dw_sync_addr); __raw_writel(0XCAFECAFE, sync_addr);
/* update board state */ /* update board state */
dev_context->brd_state = BRD_RUNNING; dev_context->brd_state = BRD_RUNNING;
@ -621,6 +632,9 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt,
dev_context->brd_state = BRD_UNKNOWN; dev_context->brd_state = BRD_UNKNOWN;
} }
} }
iounmap(sync_addr);
return status; return status;
} }
@ -1796,12 +1810,13 @@ static int mem_map_vmalloc(struct bridge_dev_context *dev_context,
* ======== wait_for_start ======== * ======== wait_for_start ========
* Wait for the singal from DSP that it has started, or time out. * Wait for the singal from DSP that it has started, or time out.
*/ */
bool wait_for_start(struct bridge_dev_context *dev_context, u32 dw_sync_addr) bool wait_for_start(struct bridge_dev_context *dev_context,
void __iomem *sync_addr)
{ {
u16 timeout = TIHELEN_ACKTIMEOUT; u16 timeout = TIHELEN_ACKTIMEOUT;
/* Wait for response from board */ /* Wait for response from board */
while (__raw_readw(dw_sync_addr) && --timeout) while (__raw_readw(sync_addr) && --timeout)
udelay(10); udelay(10);
/* If timed out: return false */ /* If timed out: return false */