Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 297513
b: refs/heads/master
c: b06db6e
h: refs/heads/master
i:
  297511: 8640cd0
v: v3
  • Loading branch information
Boojin Kim authored and Vinod Koul committed Mar 8, 2012
1 parent aa4a439 commit aaa6b07
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 47 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b7d861d9394534db94f0fb8f4b9d984f996d0528
refs/heads/master: b06db6e56c0850617291b8921582d04255022425
46 changes: 0 additions & 46 deletions trunk/drivers/dma/pl330.c
Original file line number Diff line number Diff line change
Expand Up @@ -1824,52 +1824,6 @@ static int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op)
return ret;
}

static int pl330_chan_status(void *ch_id, struct pl330_chanstatus *pstatus)
{
struct pl330_thread *thrd = ch_id;
struct pl330_dmac *pl330;
struct pl330_info *pi;
void __iomem *regs;
int active;
u32 val;

if (!pstatus || !thrd || thrd->free)
return -EINVAL;

pl330 = thrd->dmac;
pi = pl330->pinfo;
regs = pi->base;

/* The client should remove the DMAC and add again */
if (pl330->state == DYING)
pstatus->dmac_halted = true;
else
pstatus->dmac_halted = false;

val = readl(regs + FSC);
if (val & (1 << thrd->id))
pstatus->faulting = true;
else
pstatus->faulting = false;

active = thrd->req_running;

if (active == -1) {
/* Indicate that the thread is not running */
pstatus->top_req = NULL;
pstatus->wait_req = NULL;
} else {
pstatus->top_req = thrd->req[active].r;
pstatus->wait_req = !IS_FREE(&thrd->req[1 - active])
? thrd->req[1 - active].r : NULL;
}

pstatus->src_addr = readl(regs + SA(thrd->id));
pstatus->dst_addr = readl(regs + DA(thrd->id));

return 0;
}

/* Reserve an event */
static inline int _alloc_event(struct pl330_thread *thrd)
{
Expand Down

0 comments on commit aaa6b07

Please sign in to comment.