Prechádzať zdrojové kódy

sata_mv: fix irq mask races

Prevent racing on the main interrupt mask during port_start and port_stop.
Otherwise, we end up with IRQs masked on inactive ports,
and hotplug insertions then get missed later on.

Found while debugging (out of tree) target mode operations,
but the bug is present and impacting mainline as well.

This patch should also be considered for -stable.

Signed-off-by: Mark Lord <mlord@pobox.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Mark Lord 16 rokov pred
rodič
commit
933cb8e5fc
1 zmenil súbory, kde vykonal 9 pridanie a 0 odobranie
  1. 9 0
      drivers/ata/sata_mv.c

+ 9 - 0
drivers/ata/sata_mv.c

@@ -1575,6 +1575,7 @@ static int mv_port_start(struct ata_port *ap)
 	struct device *dev = ap->host->dev;
 	struct device *dev = ap->host->dev;
 	struct mv_host_priv *hpriv = ap->host->private_data;
 	struct mv_host_priv *hpriv = ap->host->private_data;
 	struct mv_port_priv *pp;
 	struct mv_port_priv *pp;
+	unsigned long flags;
 	int tag;
 	int tag;
 
 
 	pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL);
 	pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL);
@@ -1610,8 +1611,12 @@ static int mv_port_start(struct ata_port *ap)
 			pp->sg_tbl_dma[tag] = pp->sg_tbl_dma[0];
 			pp->sg_tbl_dma[tag] = pp->sg_tbl_dma[0];
 		}
 		}
 	}
 	}
+
+	spin_lock_irqsave(ap->lock, flags);
 	mv_save_cached_regs(ap);
 	mv_save_cached_regs(ap);
 	mv_edma_cfg(ap, 0, 0);
 	mv_edma_cfg(ap, 0, 0);
+	spin_unlock_irqrestore(ap->lock, flags);
+
 	return 0;
 	return 0;
 
 
 out_port_free_dma_mem:
 out_port_free_dma_mem:
@@ -1630,8 +1635,12 @@ out_port_free_dma_mem:
  */
  */
 static void mv_port_stop(struct ata_port *ap)
 static void mv_port_stop(struct ata_port *ap)
 {
 {
+	unsigned long flags;
+
+	spin_lock_irqsave(ap->lock, flags);
 	mv_stop_edma(ap);
 	mv_stop_edma(ap);
 	mv_enable_port_irqs(ap, 0);
 	mv_enable_port_irqs(ap, 0);
+	spin_unlock_irqrestore(ap->lock, flags);
 	mv_port_free_dma_mem(ap);
 	mv_port_free_dma_mem(ap);
 }
 }