Merge branch 'fixes' into next
This commit is contained in:
commit
56cbb3dd48
|
@ -1433,6 +1433,7 @@ static int pl08x_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
|
||||||
* signal
|
* signal
|
||||||
*/
|
*/
|
||||||
release_phy_channel(plchan);
|
release_phy_channel(plchan);
|
||||||
|
plchan->phychan_hold = 0;
|
||||||
}
|
}
|
||||||
/* Dequeue jobs and free LLIs */
|
/* Dequeue jobs and free LLIs */
|
||||||
if (plchan->at) {
|
if (plchan->at) {
|
||||||
|
|
|
@ -2225,12 +2225,9 @@ static inline void free_desc_list(struct list_head *list)
|
||||||
{
|
{
|
||||||
struct dma_pl330_dmac *pdmac;
|
struct dma_pl330_dmac *pdmac;
|
||||||
struct dma_pl330_desc *desc;
|
struct dma_pl330_desc *desc;
|
||||||
struct dma_pl330_chan *pch;
|
struct dma_pl330_chan *pch = NULL;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
if (list_empty(list))
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* Finish off the work list */
|
/* Finish off the work list */
|
||||||
list_for_each_entry(desc, list, node) {
|
list_for_each_entry(desc, list, node) {
|
||||||
dma_async_tx_callback callback;
|
dma_async_tx_callback callback;
|
||||||
|
@ -2247,6 +2244,10 @@ static inline void free_desc_list(struct list_head *list)
|
||||||
desc->pchan = NULL;
|
desc->pchan = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* pch will be unset if list was empty */
|
||||||
|
if (!pch)
|
||||||
|
return;
|
||||||
|
|
||||||
pdmac = pch->dmac;
|
pdmac = pch->dmac;
|
||||||
|
|
||||||
spin_lock_irqsave(&pdmac->pool_lock, flags);
|
spin_lock_irqsave(&pdmac->pool_lock, flags);
|
||||||
|
@ -2257,12 +2258,9 @@ static inline void free_desc_list(struct list_head *list)
|
||||||
static inline void handle_cyclic_desc_list(struct list_head *list)
|
static inline void handle_cyclic_desc_list(struct list_head *list)
|
||||||
{
|
{
|
||||||
struct dma_pl330_desc *desc;
|
struct dma_pl330_desc *desc;
|
||||||
struct dma_pl330_chan *pch;
|
struct dma_pl330_chan *pch = NULL;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
if (list_empty(list))
|
|
||||||
return;
|
|
||||||
|
|
||||||
list_for_each_entry(desc, list, node) {
|
list_for_each_entry(desc, list, node) {
|
||||||
dma_async_tx_callback callback;
|
dma_async_tx_callback callback;
|
||||||
|
|
||||||
|
@ -2274,6 +2272,10 @@ static inline void handle_cyclic_desc_list(struct list_head *list)
|
||||||
callback(desc->txd.callback_param);
|
callback(desc->txd.callback_param);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* pch will be unset if list was empty */
|
||||||
|
if (!pch)
|
||||||
|
return;
|
||||||
|
|
||||||
spin_lock_irqsave(&pch->lock, flags);
|
spin_lock_irqsave(&pch->lock, flags);
|
||||||
list_splice_tail_init(list, &pch->work_list);
|
list_splice_tail_init(list, &pch->work_list);
|
||||||
spin_unlock_irqrestore(&pch->lock, flags);
|
spin_unlock_irqrestore(&pch->lock, flags);
|
||||||
|
@ -2926,8 +2928,11 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
|
||||||
INIT_LIST_HEAD(&pd->channels);
|
INIT_LIST_HEAD(&pd->channels);
|
||||||
|
|
||||||
/* Initialize channel parameters */
|
/* Initialize channel parameters */
|
||||||
num_chan = max(pdat ? pdat->nr_valid_peri : (u8)pi->pcfg.num_peri,
|
if (pdat)
|
||||||
(u8)pi->pcfg.num_chan);
|
num_chan = max_t(int, pdat->nr_valid_peri, pi->pcfg.num_chan);
|
||||||
|
else
|
||||||
|
num_chan = max_t(int, pi->pcfg.num_peri, pi->pcfg.num_chan);
|
||||||
|
|
||||||
pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);
|
pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);
|
||||||
|
|
||||||
for (i = 0; i < num_chan; i++) {
|
for (i = 0; i < num_chan; i++) {
|
||||||
|
|
Loading…
Reference in a new issue