Skip to contentSkip to conversation

slc90e66: fix deadlock on error handling

PATCH NAK Bartlomiej Zolnierkiewicz 2 participants 2 messages Oct 1, 2007 – Oct 2, 2007 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 5/15 slc90e66: fix deadlock on error handling

* 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.

* Bump driver version.

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/pci/slc90e66.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/ide/pci/slc90e66.c +5 -3
Index: b/drivers/ide/pci/slc90e66.c
===================================================================
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/ide/pci/slc90e66.c	Version 0.18	Aug 9, 2007
+ *  linux/drivers/ide/pci/slc90e66.c	Version 0.19	Sep 24, 2007
  *
  *  Copyright (C) 2000-2002 Andre Hedrick <[email protected]>
  *  Copyright (C) 2006-2007 MontaVista Software, Inc. <[email protected]>

@@ -21,6 +21,8 @@
 
 #include <asm/io.h>
 
+static DEFINE_SPINLOCK(slc90e66_lock);
+
 static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
 	ide_hwif_t *hwif	= HWIF(drive);

@@ -40,7 +42,7 @@ static void slc90e66_set_pio_mode(ide_dr
 					{ 2, 1 },
 					{ 2, 3 }, };
 
-	spin_lock_irqsave(&ide_lock, flags);
+	spin_lock_irqsave(&slc90e66_lock, flags);
 	pci_read_config_word(dev, master_port, &master_data);
 
 	if (pio > 1)

@@ -71,7 +73,7 @@ static void slc90e66_set_pio_mode(ide_dr
 	pci_write_config_word(dev, master_port, master_data);
 	if (is_slave)
 		pci_write_config_byte(dev, slave_port, slave_data);
-	spin_unlock_irqrestore(&ide_lock, flags);
+	spin_unlock_irqrestore(&slc90e66_lock, flags);
 }
 
 static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)
Acked-by on v1 5/15
#1 lore raw
Quoted 4 lines · Bartlomiej Zolnierkiewicz

* 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.

... and in the piix as well. Since I failed to see what could lead to this
in the kernel.org code, I haven't carried the fix to slc90e66...

Quoted 3 lines

* Bump driver version.

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Acked-by Sergei Shtylyov <[email protected]>

MBR, Sergei