--- drivers/ata/ata_piix.c

+++ drivers/ata/ata_piix.c

@@ -157,6 +157,7 @@ struct piix_map_db {

struct piix_host_priv {

const int *map;

u32 saved_iocfg;

+ spinlock_t sidpr_lock; /* FIXME: remove once locking in EH is fixed */

void __iomem *sidpr;

};

@@ -948,12 +949,15 @@ static int piix_sidpr_scr_read(struct at

unsigned int reg, u32 *val)

{

struct piix_host_priv *hpriv = link->ap->host->private_data;

+ unsigned long flags;

if (reg >= ARRAY_SIZE(piix_sidx_map))

return -EINVAL;

+ spin_lock_irqsave(&hpriv->sidpr_lock, flags);

piix_sidpr_sel(link, reg);

*val = ioread32(hpriv->sidpr + PIIX_SIDPR_DATA);

+ spin_unlock_irqrestore(&hpriv->sidpr_lock, flags);

return 0;

}

@@ -961,12 +965,15 @@ static int piix_sidpr_scr_write(struct a

unsigned int reg, u32 val)

{

struct piix_host_priv *hpriv = link->ap->host->private_data;

+ unsigned long flags;

if (reg >= ARRAY_SIZE(piix_sidx_map))

return -EINVAL;

+ spin_lock_irqsave(&hpriv->sidpr_lock, flags);

piix_sidpr_sel(link, reg);

iowrite32(val, hpriv->sidpr + PIIX_SIDPR_DATA);

+ spin_unlock_irqrestore(&hpriv->sidpr_lock, flags);

return 0;

}

@@ -1555,6 +1562,7 @@ static int __devinit piix_init_one(struc

hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL);

if (!hpriv)

return -ENOMEM;

+ spin_lock_init(&hpriv->sidpr_lock);

/* Save IOCFG, this will be used for cable detection, quirk

* detection and restoration on detach. This is necessary