lkml.org 
[lkml]   [2010]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
Subject[PATCH 2/3] pata_oldpiix: add locking for parallel scanning
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] pata_oldpiix: add locking for parallel scanning

Add an extra locking for parallel scanning.

This is similar change as commit 60c3be3 for ata_piix host driver
and while pata_oldpiix doesn't enable parallel scan yet the race
could probably also be triggered by requesting re-scanning of both
ports at the same time using SCSI sysfs interface.

Fix documentation while at it.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/ata/pata_oldpiix.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
Index: b/drivers/ata/pata_oldpiix.c
===================================================================
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -1,7 +1,8 @@
/*
- * pata_oldpiix.c - Intel PATA/SATA controllers
+ * pata_oldpiix.c - older Intel PATA controllers
*
* (C) 2005 Red Hat
+ * (C) 2010 Bartlomiej Zolnierkiewicz
*
* Some parts based on ata_piix.c by Jeff Garzik and others.
*
@@ -50,10 +51,13 @@ static int oldpiix_pre_reset(struct ata_
return ata_sff_prereset(link, deadline);
}

+static DEFINE_SPINLOCK(piix_lock);
+
static void oldpiix_set_timings(struct ata_port *ap, struct ata_device *adev,
u8 pio, bool use_mwdma)
{
struct pci_dev *dev = to_pci_dev(ap->host->dev);
+ unsigned long flags;
unsigned int idetm_port= ap->port_no ? 0x42 : 0x40;
u16 idetm_data;
int control = 0;
@@ -84,6 +88,8 @@ static void oldpiix_set_timings(struct a
/* Enable DMA timing only */
control |= 8; /* PIO cycles in PIO0 */

+ spin_lock_irqsave(&piix_lock, flags);
+
pci_read_config_word(dev, idetm_port, &idetm_data);

/*
@@ -101,6 +107,8 @@ static void oldpiix_set_timings(struct a
(timings[pio][1] << 8);
pci_write_config_word(dev, idetm_port, idetm_data);

+ spin_unlock_irqrestore(&piix_lock, flags);
+
/* Track which port is configured */
ap->private_data = adev;
}

\
 
 \ /
  Last update: 2010-02-18 20:03    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site