Skip to content

L
linux
Commit 271e1b86 authored by Addy Ke's avatar Addy Ke Committed by Vinod Koul
Browse files
Options

dmaengine: pl330: add quirk for broken no flushp 

This patch add "arm,pl330-broken-no-flushp" quirk to avoid execute
DMAFLUSHP if Soc doesn't support it.
Signed-off-by: default avatarAddy Ke <addy.ke@rock-chips.com>
Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
cc: Doug Anderson <dianders@chromium.org>
cc: Heiko Stuebner <heiko@sntech.de>
cc: Olof Johansson <olof@lixom.net>
Reviewed-by: default avatarSonny Rao <sonnyrao@chromium.org>
Signed-off-by: default avatarCaesar Wang <wxt@rock-chips.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 2318a3dd
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 25 deletions
drivers/dma/pl330.c
View file @ 271e1b86
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#define PL330_MAX_IRQS 32 #define PL330_MAX_IRQS 32
#define PL330_MAX_PERI 32 #define PL330_MAX_PERI 32
#define PL330_QUIRK_BROKEN_NO_FLUSHP BIT(0)
enum pl330_cachectrl { enum pl330_cachectrl {
CCTRL0, /* Noncacheable and nonbufferable */ CCTRL0, /* Noncacheable and nonbufferable */
CCTRL1, /* Bufferable only */ CCTRL1, /* Bufferable only */
...@@ -488,6 +490,17 @@ struct pl330_dmac { ...@@ -488,6 +490,17 @@ struct pl330_dmac {
/* Peripheral channels connected to this DMAC */ /* Peripheral channels connected to this DMAC */
unsigned int num_peripherals; unsigned int num_peripherals;
struct dma_pl330_chan *peripherals; /* keep at end */ struct dma_pl330_chan *peripherals; /* keep at end */
int quirks;
};
static struct pl330_of_quirks {
char *quirk;
int id;
} of_quirks[] = {
{
.quirk = "arm,pl330-broken-no-flushp",
.id = PL330_QUIRK_BROKEN_NO_FLUSHP,
}
}; };
struct dma_pl330_desc { struct dma_pl330_desc {
...@@ -1137,53 +1150,68 @@ static inline int _ldst_memtomem(unsigned dry_run, u8 buf[], ...@@ -1137,53 +1150,68 @@ static inline int _ldst_memtomem(unsigned dry_run, u8 buf[],
return off; return off;
} }
static inline int _ldst_devtomem(unsigned dry_run, u8 buf[], static inline int _ldst_devtomem(struct pl330_dmac *pl330, unsigned dry_run,
const struct _xfer_spec *pxs, int cyc) u8 buf[], const struct _xfer_spec *pxs,
int cyc)
{ {
int off = 0; int off = 0;
enum pl330_cond cond; enum pl330_cond cond;
cond = (pxs->desc->rqcfg.brst_len == 1) ? SINGLE : BURST; if (pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP)
cond = BURST;
else
cond = (pxs->desc->rqcfg.brst_len == 1) ? SINGLE : BURST;
while (cyc--) { while (cyc--) {
off += _emit_WFP(dry_run, &buf[off], cond, pxs->desc->peri); off += _emit_WFP(dry_run, &buf[off], cond, pxs->desc->peri);
off += _emit_LDP(dry_run, &buf[off], cond, pxs->desc->peri); off += _emit_LDP(dry_run, &buf[off], cond, pxs->desc->peri);
off += _emit_ST(dry_run, &buf[off], ALWAYS); off += _emit_ST(dry_run, &buf[off], ALWAYS);
off += _emit_FLUSHP(dry_run, &buf[off], pxs->desc->peri);
if (!(pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP))
off += _emit_FLUSHP(dry_run, &buf[off],
pxs->desc->peri);
} }
return off; return off;
} }
static inline int _ldst_memtodev(unsigned dry_run, u8 buf[], static inline int _ldst_memtodev(struct pl330_dmac *pl330,
const struct _xfer_spec *pxs, int cyc) unsigned dry_run, u8 buf[],
const struct _xfer_spec *pxs, int cyc)
{ {
int off = 0; int off = 0;
enum pl330_cond cond; enum pl330_cond cond;
cond = (pxs->desc->rqcfg.brst_len == 1) ? SINGLE : BURST; if (pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP)
cond = BURST;
else
cond = (pxs->desc->rqcfg.brst_len == 1) ? SINGLE : BURST;
while (cyc--) { while (cyc--) {
off += _emit_WFP(dry_run, &buf[off], cond, pxs->desc->peri); off += _emit_WFP(dry_run, &buf[off], cond, pxs->desc->peri);
off += _emit_LD(dry_run, &buf[off], ALWAYS); off += _emit_LD(dry_run, &buf[off], ALWAYS);
off += _emit_STP(dry_run, &buf[off], cond, pxs->desc->peri); off += _emit_STP(dry_run, &buf[off], cond, pxs->desc->peri);
off += _emit_FLUSHP(dry_run, &buf[off], pxs->desc->peri);
if (!(pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP))
off += _emit_FLUSHP(dry_run, &buf[off],
pxs->desc->peri);
} }
return off; return off;
} }
static int _bursts(unsigned dry_run, u8 buf[], static int _bursts(struct pl330_dmac *pl330, unsigned dry_run, u8 buf[],
const struct _xfer_spec *pxs, int cyc) const struct _xfer_spec *pxs, int cyc)
{ {
int off = 0; int off = 0;
switch (pxs->desc->rqtype) { switch (pxs->desc->rqtype) {
case DMA_MEM_TO_DEV: case DMA_MEM_TO_DEV:
off += _ldst_memtodev(dry_run, &buf[off], pxs, cyc); off += _ldst_memtodev(pl330, dry_run, &buf[off], pxs, cyc);
break; break;
case DMA_DEV_TO_MEM: case DMA_DEV_TO_MEM:
off += _ldst_devtomem(dry_run, &buf[off], pxs, cyc); off += _ldst_devtomem(pl330, dry_run, &buf[off], pxs, cyc);
break; break;
case DMA_MEM_TO_MEM: case DMA_MEM_TO_MEM:
off += _ldst_memtomem(dry_run, &buf[off], pxs, cyc); off += _ldst_memtomem(dry_run, &buf[off], pxs, cyc);
...@@ -1197,7 +1225,7 @@ static int _bursts(unsigned dry_run, u8 buf[], ...@@ -1197,7 +1225,7 @@ static int _bursts(unsigned dry_run, u8 buf[],
} }
/* Returns bytes consumed and updates bursts */ /* Returns bytes consumed and updates bursts */
static inline int _loop(unsigned dry_run, u8 buf[], static inline int _loop(struct pl330_dmac *pl330, unsigned dry_run, u8 buf[],
unsigned long *bursts, const struct _xfer_spec *pxs) unsigned long *bursts, const struct _xfer_spec *pxs)
{ {
int cyc, cycmax, szlp, szlpend, szbrst, off; int cyc, cycmax, szlp, szlpend, szbrst, off;
...@@ -1223,7 +1251,7 @@ static inline int _loop(unsigned dry_run, u8 buf[], ...@@ -1223,7 +1251,7 @@ static inline int _loop(unsigned dry_run, u8 buf[],
} }
szlp = _emit_LP(1, buf, 0, 0); szlp = _emit_LP(1, buf, 0, 0);
szbrst = _bursts(1, buf, pxs, 1); szbrst = _bursts(pl330, 1, buf, pxs, 1);
lpend.cond = ALWAYS; lpend.cond = ALWAYS;
lpend.forever = false; lpend.forever = false;
...@@ -1255,7 +1283,7 @@ static inline int _loop(unsigned dry_run, u8 buf[], ...@@ -1255,7 +1283,7 @@ static inline int _loop(unsigned dry_run, u8 buf[],
off += _emit_LP(dry_run, &buf[off], 1, lcnt1); off += _emit_LP(dry_run, &buf[off], 1, lcnt1);
ljmp1 = off; ljmp1 = off;
off += _bursts(dry_run, &buf[off], pxs, cyc); off += _bursts(pl330, dry_run, &buf[off], pxs, cyc);
lpend.cond = ALWAYS; lpend.cond = ALWAYS;
lpend.forever = false; lpend.forever = false;
...@@ -1278,8 +1306,9 @@ static inline int _loop(unsigned dry_run, u8 buf[], ...@@ -1278,8 +1306,9 @@ static inline int _loop(unsigned dry_run, u8 buf[],
return off; return off;
} }
static inline int _setup_loops(unsigned dry_run, u8 buf[], static inline int _setup_loops(struct pl330_dmac *pl330,
const struct _xfer_spec *pxs) unsigned dry_run, u8 buf[],
const struct _xfer_spec *pxs)
{ {
struct pl330_xfer *x = &pxs->desc->px; struct pl330_xfer *x = &pxs->desc->px;
u32 ccr = pxs->ccr; u32 ccr = pxs->ccr;
...@@ -1288,15 +1317,16 @@ static inline int _setup_loops(unsigned dry_run, u8 buf[], ...@@ -1288,15 +1317,16 @@ static inline int _setup_loops(unsigned dry_run, u8 buf[],
while (bursts) { while (bursts) {
c = bursts; c = bursts;
off += _loop(dry_run, &buf[off], &c, pxs); off += _loop(pl330, dry_run, &buf[off], &c, pxs);
bursts -= c; bursts -= c;
} }
return off; return off;
} }
static inline int _setup_xfer(unsigned dry_run, u8 buf[], static inline int _setup_xfer(struct pl330_dmac *pl330,
const struct _xfer_spec *pxs) unsigned dry_run, u8 buf[],
const struct _xfer_spec *pxs)
{ {
struct pl330_xfer *x = &pxs->desc->px; struct pl330_xfer *x = &pxs->desc->px;
int off = 0; int off = 0;
...@@ -1307,7 +1337,7 @@ static inline int _setup_xfer(unsigned dry_run, u8 buf[], ...@@ -1307,7 +1337,7 @@ static inline int _setup_xfer(unsigned dry_run, u8 buf[],
off += _emit_MOV(dry_run, &buf[off], DAR, x->dst_addr); off += _emit_MOV(dry_run, &buf[off], DAR, x->dst_addr);
/* Setup Loop(s) */ /* Setup Loop(s) */
off += _setup_loops(dry_run, &buf[off], pxs); off += _setup_loops(pl330, dry_run, &buf[off], pxs);
return off; return off;
} }
...@@ -1316,8 +1346,9 @@ static inline int _setup_xfer(unsigned dry_run, u8 buf[], ...@@ -1316,8 +1346,9 @@ static inline int _setup_xfer(unsigned dry_run, u8 buf[],
* A req is a sequence of one or more xfer units. * A req is a sequence of one or more xfer units.
* Returns the number of bytes taken to setup the MC for the req. * Returns the number of bytes taken to setup the MC for the req.
*/ */
static int _setup_req(unsigned dry_run, struct pl330_thread *thrd, static int _setup_req(struct pl330_dmac *pl330, unsigned dry_run,
unsigned index, struct _xfer_spec *pxs) struct pl330_thread *thrd, unsigned index,
struct _xfer_spec *pxs)
{ {
struct _pl330_req *req = &thrd->req[index]; struct _pl330_req *req = &thrd->req[index];
struct pl330_xfer *x; struct pl330_xfer *x;
...@@ -1334,7 +1365,7 @@ static int _setup_req(unsigned dry_run, struct pl330_thread *thrd, ...@@ -1334,7 +1365,7 @@ static int _setup_req(unsigned dry_run, struct pl330_thread *thrd,
if (x->bytes % (BRST_SIZE(pxs->ccr) * BRST_LEN(pxs->ccr))) if (x->bytes % (BRST_SIZE(pxs->ccr) * BRST_LEN(pxs->ccr)))
return -EINVAL; return -EINVAL;
off += _setup_xfer(dry_run, &buf[off], pxs); off += _setup_xfer(pl330, dry_run, &buf[off], pxs);
/* DMASEV peripheral/event */ /* DMASEV peripheral/event */
off += _emit_SEV(dry_run, &buf[off], thrd->ev); off += _emit_SEV(dry_run, &buf[off], thrd->ev);
...@@ -1428,7 +1459,7 @@ static int pl330_submit_req(struct pl330_thread *thrd, ...@@ -1428,7 +1459,7 @@ static int pl330_submit_req(struct pl330_thread *thrd,
xs.desc = desc; xs.desc = desc;
/* First dry run to check if req is acceptable */ /* First dry run to check if req is acceptable */
ret = _setup_req(1, thrd, idx, &xs); ret = _setup_req(pl330, 1, thrd, idx, &xs);
if (ret < 0) if (ret < 0)
goto xfer_exit; goto xfer_exit;
...@@ -1442,7 +1473,7 @@ static int pl330_submit_req(struct pl330_thread *thrd, ...@@ -1442,7 +1473,7 @@ static int pl330_submit_req(struct pl330_thread *thrd,
/* Hook the request */ /* Hook the request */
thrd->lstenq = idx; thrd->lstenq = idx;
thrd->req[idx].desc = desc; thrd->req[idx].desc = desc;
_setup_req(0, thrd, idx, &xs); _setup_req(pl330, 0, thrd, idx, &xs);
ret = 0; ret = 0;
...@@ -2787,6 +2818,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) ...@@ -2787,6 +2818,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
struct resource *res; struct resource *res;
int i, ret, irq; int i, ret, irq;
int num_chan; int num_chan;
struct device_node *np = adev->dev.of_node;
pdat = dev_get_platdata(&adev->dev); pdat = dev_get_platdata(&adev->dev);
...@@ -2806,6 +2838,11 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) ...@@ -2806,6 +2838,11 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
pl330->mcbufsz = pdat ? pdat->mcbuf_sz : 0; pl330->mcbufsz = pdat ? pdat->mcbuf_sz : 0;
/* get quirk */
for (i = 0; i < ARRAY_SIZE(of_quirks); i++)
if (of_property_read_bool(np, of_quirks[i].quirk))
pl330->quirks |= of_quirks[i].id;
res = &adev->res; res = &adev->res;
pl330->base = devm_ioremap_resource(&adev->dev, res); pl330->base = devm_ioremap_resource(&adev->dev, res);
if (IS_ERR(pl330->base)) if (IS_ERR(pl330->base))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7