[PATCH 1/4] dmaengine: pl330: cleanup quirk pass code

From: Alexander Kochetkov
Date: Thu Feb 18 2016 - 07:31:53 EST


The patch add 'quirk' member to 'struct _xfer_spec' and
remove 'struct pl330_dmac *pl330' parameter from
many intermediate functions.

Signed-off-by: Alexander Kochetkov <al.kochet@xxxxxxxxx>
---
drivers/dma/pl330.c | 59 ++++++++++++++++++++++++---------------------------
1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 1b0453b..7a17c0f 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -534,6 +534,7 @@ struct dma_pl330_desc {
struct _xfer_spec {
u32 ccr;
struct dma_pl330_desc *desc;
+ int quirks;
};

static inline bool _queue_empty(struct pl330_thread *thrd)
@@ -1151,14 +1152,13 @@ static inline int _ldst_memtomem(unsigned dry_run, u8 buf[],
return off;
}

-static inline int _ldst_devtomem(struct pl330_dmac *pl330, unsigned dry_run,
- u8 buf[], const struct _xfer_spec *pxs,
- int cyc)
+static inline int _ldst_devtomem(unsigned dry_run, u8 buf[],
+ const struct _xfer_spec *pxs, int cyc)
{
int off = 0;
enum pl330_cond cond;

- if (pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP)
+ if (pxs->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP)
cond = BURST;
else
cond = (pxs->desc->rqcfg.brst_len == 1) ? SINGLE : BURST;
@@ -1168,7 +1168,7 @@ static inline int _ldst_devtomem(struct pl330_dmac *pl330, unsigned dry_run,
off += _emit_LDP(dry_run, &buf[off], cond, pxs->desc->peri);
off += _emit_ST(dry_run, &buf[off], ALWAYS);

- if (!(pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP))
+ if (!(pxs->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP))
off += _emit_FLUSHP(dry_run, &buf[off],
pxs->desc->peri);
}
@@ -1176,14 +1176,13 @@ static inline int _ldst_devtomem(struct pl330_dmac *pl330, unsigned dry_run,
return off;
}

-static inline int _ldst_memtodev(struct pl330_dmac *pl330,
- unsigned dry_run, u8 buf[],
- const struct _xfer_spec *pxs, int cyc)
+static inline int _ldst_memtodev(unsigned dry_run, u8 buf[],
+ const struct _xfer_spec *pxs, int cyc)
{
int off = 0;
enum pl330_cond cond;

- if (pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP)
+ if (pxs->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP)
cond = BURST;
else
cond = (pxs->desc->rqcfg.brst_len == 1) ? SINGLE : BURST;
@@ -1194,7 +1193,7 @@ static inline int _ldst_memtodev(struct pl330_dmac *pl330,
off += _emit_LD(dry_run, &buf[off], ALWAYS);
off += _emit_STP(dry_run, &buf[off], cond, pxs->desc->peri);

- if (!(pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP))
+ if (!(pxs->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP))
off += _emit_FLUSHP(dry_run, &buf[off],
pxs->desc->peri);
}
@@ -1202,17 +1201,17 @@ static inline int _ldst_memtodev(struct pl330_dmac *pl330,
return off;
}

-static int _bursts(struct pl330_dmac *pl330, unsigned dry_run, u8 buf[],
+static int _bursts(unsigned dry_run, u8 buf[],
const struct _xfer_spec *pxs, int cyc)
{
int off = 0;

switch (pxs->desc->rqtype) {
case DMA_MEM_TO_DEV:
- off += _ldst_memtodev(pl330, dry_run, &buf[off], pxs, cyc);
+ off += _ldst_memtodev(dry_run, &buf[off], pxs, cyc);
break;
case DMA_DEV_TO_MEM:
- off += _ldst_devtomem(pl330, dry_run, &buf[off], pxs, cyc);
+ off += _ldst_devtomem(dry_run, &buf[off], pxs, cyc);
break;
case DMA_MEM_TO_MEM:
off += _ldst_memtomem(dry_run, &buf[off], pxs, cyc);
@@ -1226,7 +1225,7 @@ static int _bursts(struct pl330_dmac *pl330, unsigned dry_run, u8 buf[],
}

/* Returns bytes consumed and updates bursts */
-static inline int _loop(struct pl330_dmac *pl330, unsigned dry_run, u8 buf[],
+static inline int _loop(unsigned dry_run, u8 buf[],
unsigned long *bursts, const struct _xfer_spec *pxs)
{
int cyc, cycmax, szlp, szlpend, szbrst, off;
@@ -1234,7 +1233,7 @@ static inline int _loop(struct pl330_dmac *pl330, unsigned dry_run, u8 buf[],
struct _arg_LPEND lpend;

if (*bursts == 1)
- return _bursts(pl330, dry_run, buf, pxs, 1);
+ return _bursts(dry_run, buf, pxs, 1);

/* Max iterations possible in DMALP is 256 */
if (*bursts >= 256*256) {
@@ -1252,7 +1251,7 @@ static inline int _loop(struct pl330_dmac *pl330, unsigned dry_run, u8 buf[],
}

szlp = _emit_LP(1, buf, 0, 0);
- szbrst = _bursts(pl330, 1, buf, pxs, 1);
+ szbrst = _bursts(1, buf, pxs, 1);

lpend.cond = ALWAYS;
lpend.forever = false;
@@ -1284,7 +1283,7 @@ static inline int _loop(struct pl330_dmac *pl330, unsigned dry_run, u8 buf[],
off += _emit_LP(dry_run, &buf[off], 1, lcnt1);
ljmp1 = off;

- off += _bursts(pl330, dry_run, &buf[off], pxs, cyc);
+ off += _bursts(dry_run, &buf[off], pxs, cyc);

lpend.cond = ALWAYS;
lpend.forever = false;
@@ -1307,9 +1306,8 @@ static inline int _loop(struct pl330_dmac *pl330, unsigned dry_run, u8 buf[],
return off;
}

-static inline int _setup_loops(struct pl330_dmac *pl330,
- unsigned dry_run, u8 buf[],
- const struct _xfer_spec *pxs)
+static inline int _setup_loops(unsigned dry_run, u8 buf[],
+ const struct _xfer_spec *pxs)
{
struct pl330_xfer *x = &pxs->desc->px;
u32 ccr = pxs->ccr;
@@ -1318,16 +1316,15 @@ static inline int _setup_loops(struct pl330_dmac *pl330,

while (bursts) {
c = bursts;
- off += _loop(pl330, dry_run, &buf[off], &c, pxs);
+ off += _loop(dry_run, &buf[off], &c, pxs);
bursts -= c;
}

return off;
}

-static inline int _setup_xfer(struct pl330_dmac *pl330,
- unsigned dry_run, u8 buf[],
- const struct _xfer_spec *pxs)
+static inline int _setup_xfer(unsigned dry_run, u8 buf[],
+ const struct _xfer_spec *pxs)
{
struct pl330_xfer *x = &pxs->desc->px;
int off = 0;
@@ -1338,7 +1335,7 @@ static inline int _setup_xfer(struct pl330_dmac *pl330,
off += _emit_MOV(dry_run, &buf[off], DAR, x->dst_addr);

/* Setup Loop(s) */
- off += _setup_loops(pl330, dry_run, &buf[off], pxs);
+ off += _setup_loops(dry_run, &buf[off], pxs);

return off;
}
@@ -1347,9 +1344,8 @@ static inline int _setup_xfer(struct pl330_dmac *pl330,
* A req is a sequence of one or more xfer units.
* Returns the number of bytes taken to setup the MC for the req.
*/
-static int _setup_req(struct pl330_dmac *pl330, unsigned dry_run,
- struct pl330_thread *thrd, unsigned index,
- struct _xfer_spec *pxs)
+static int _setup_req(unsigned dry_run, struct pl330_thread *thrd,
+ unsigned index, struct _xfer_spec *pxs)
{
struct _pl330_req *req = &thrd->req[index];
struct pl330_xfer *x;
@@ -1366,7 +1362,7 @@ static int _setup_req(struct pl330_dmac *pl330, unsigned dry_run,
if (x->bytes % (BRST_SIZE(pxs->ccr) * BRST_LEN(pxs->ccr)))
return -EINVAL;

- off += _setup_xfer(pl330, dry_run, &buf[off], pxs);
+ off += _setup_xfer(dry_run, &buf[off], pxs);

/* DMASEV peripheral/event */
off += _emit_SEV(dry_run, &buf[off], thrd->ev);
@@ -1458,9 +1454,10 @@ static int pl330_submit_req(struct pl330_thread *thrd,

xs.ccr = ccr;
xs.desc = desc;
+ xs.quirks = pl330->quirks;

/* First dry run to check if req is acceptable */
- ret = _setup_req(pl330, 1, thrd, idx, &xs);
+ ret = _setup_req(1, thrd, idx, &xs);
if (ret < 0)
goto xfer_exit;

@@ -1474,7 +1471,7 @@ static int pl330_submit_req(struct pl330_thread *thrd,
/* Hook the request */
thrd->lstenq = idx;
thrd->req[idx].desc = desc;
- _setup_req(pl330, 0, thrd, idx, &xs);
+ _setup_req(0, thrd, idx, &xs);

ret = 0;

--
1.7.9.5