Re: [PATCH 3/15] qd65xx: fix deadlock on error handling

[Jeff Garzik <jeff@garzik.org>]

Sergei Shtylyov wrote:
> Bartlomiej Zolnierkiewicz wrote:
> 
>> Stop abusing ide_lock lock (switch to a private locking).
> 
>> Fixes same issue as fixed by Alan Cox in atiixp host driver with
>> commit 6c5f8cc33eb2e10b6ab788bbe259fc142a068627.
> 
>> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> 
>> Index: b/drivers/ide/legacy/qd65xx.c
>> ===================================================================
>> --- a/drivers/ide/legacy/qd65xx.c
>> +++ b/drivers/ide/legacy/qd65xx.c
>> @@ -89,13 +89,15 @@
>>  
>>  static int timings[4]={-1,-1,-1,-1}; /* stores current timing for 
>> each timer */
>>  
>> +static DEFINE_SPINLOCK(qd65xx_lock);
>> +
>>  static void qd_write_reg (u8 content, unsigned long reg)
>>  {
>>      unsigned long flags;
>>  
>> -    spin_lock_irqsave(&ide_lock, flags);
>> +    spin_lock_irqsave(&qd65xx_lock, flags);
>>      outb(content,reg);
>> -    spin_unlock_irqrestore(&ide_lock, flags);
>> +    spin_unlock_irqrestore(&qd65xx_lock, flags);
>>  }
>>  
>>  static u8 __init qd_read_reg (unsigned long reg)
>> @@ -103,9 +105,9 @@ static u8 __init qd_read_reg (unsigned l
>>      unsigned long flags;
>>      u8 read;
>>  
>> -    spin_lock_irqsave(&ide_lock, flags);
>> +    spin_lock_irqsave(&qd65xx_lock, flags);
>>      read = inb(reg);
>> -    spin_unlock_irqrestore(&ide_lock, flags);
>> +    spin_unlock_irqrestore(&qd65xx_lock, flags);
>>      return read;
>>  }
> 
>    I don't see why all the locking above is needed at all -- isn't these 
> atomic functions? :-/

Agreed.

	Jeff