shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

dvb:remove the deadlock risk for spin lock[1/1]

Browse Source 
PD#SWPL-2599

Problem:
maybe the deadlock risk in the asyncfifo

Solution:
remove the spin lock in disable_irq

Verify:
Verify android p at x301

Change-Id: I3b61de07efa09837b6bfbd7c52f9dc6a867ae912
Signed-off-by: Chuangcheng Peng <chuangcheng.peng@amlogic.com>
This commit is contained in:
Chuangcheng Peng
2018-11-29 18:18:05 +08:00
committed by Dongjin Kim
parent 0879ec59c1
commit ae3d940fc6
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/amlogic/media_modules/stream_input/parser/hw_demux/aml_dmx.c
View File

@@ -2365,11 +2365,16 @@ int async_fifo_init(struct aml_asyncfifo *afifo, int initirq,
int async_fifo_deinit(struct aml_asyncfifo *afifo, int freeirq)
{
struct aml_dvb *dvb = afifo->dvb;
unsigned long flags;
if (!afifo->init)
return 0;
spin_lock_irqsave(&dvb->slock, flags);
CLEAR_ASYNC_FIFO_REG_MASK(afifo->id, REG1, 1 << ASYNC_FIFO_FLUSH_EN);
CLEAR_ASYNC_FIFO_REG_MASK(afifo->id, REG2, 1 << ASYNC_FIFO_FILL_EN);
spin_unlock_irqrestore(&dvb->slock, flags);
asyncfifo_put_buffer(afifo);
@@ -4548,11 +4553,12 @@ int aml_asyncfifo_hw_reset(struct aml_asyncfifo *afifo)
if (!buf)
return -1;
spin_lock_irqsave(&dvb->slock, flags);
if (afifo->init) {
src = afifo->source;
async_fifo_deinit(afifo, 0);
}
spin_lock_irqsave(&dvb->slock, flags);
ret = async_fifo_init(afifo, 0, len, buf);
/* restore the source */
if (src != -1)