Evgeny Rodichev wrote:
On Mon, 3 Oct 2005, Jeff Garzik wrote:
applied
This patch leads to freeze with Marvell MV88SX6041 4-port SATA II PCI-X
Controller (rev 03), as I wrote already
(http://www.uwsg.iu.edu/hypermail/linux/kernel/0510.0/0203.html)
It is impossible to reboot the system without harware reset (after
modprobe).
I'm betting a temporary workaround should be to disable CONFIG_SMP.
The first attached patch (patch.1) fixes one of the lockups. The second
attached patch (patch.2) should fix all the lockups, but that's just a
guess, and it's a very ugly patch.
Note that patch.2 depends on patch.1.
Jeff
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -409,14 +409,8 @@ static void mv_irq_clear(struct ata_port
static void mv_start_dma(void __iomem *base, struct mv_port_priv *pp,
struct ata_port *ap)
{
- unsigned long flags;
-
- spin_lock_irqsave(&ap->host_set->lock, flags);
-
writelfl(EDMA_EN, base + EDMA_CMD_OFS);
pp->pp_flags |= MV_PP_FLAG_EDMA_EN;
-
- spin_unlock_irqrestore(&ap->host_set->lock, flags);
}
static void mv_stop_dma(struct ata_port *ap)
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -413,16 +413,13 @@ static void mv_start_dma(void __iomem *b
pp->pp_flags |= MV_PP_FLAG_EDMA_EN;
}
-static void mv_stop_dma(struct ata_port *ap)
+static void __mv_stop_dma(struct ata_port *ap)
{
void __iomem *port_mmio = mv_ap_base(ap);
struct mv_port_priv *pp = ap->private_data;
- unsigned long flags;
u32 reg;
int i;
- spin_lock_irqsave(&ap->host_set->lock, flags);
-
if (!(MV_PP_FLAG_EDMA_DS_ACT & pp->pp_flags) &&
((MV_PP_FLAG_EDMA_EN & pp->pp_flags) ||
(EDMA_EN & readl(port_mmio + EDMA_CMD_OFS)))) {
@@ -433,7 +430,6 @@ static void mv_stop_dma(struct ata_port
writelfl(EDMA_DS, port_mmio + EDMA_CMD_OFS);
pp->pp_flags &= ~MV_PP_FLAG_EDMA_EN;
}
- spin_unlock_irqrestore(&ap->host_set->lock, flags);
/* now properly wait for the eDMA to stop */
for (i = 1000; i > 0; i--) {
@@ -444,15 +440,22 @@ static void mv_stop_dma(struct ata_port
udelay(100);
}
- spin_lock_irqsave(&ap->host_set->lock, flags);
pp->pp_flags &= ~MV_PP_FLAG_EDMA_DS_ACT;
- spin_unlock_irqrestore(&ap->host_set->lock, flags);
if (EDMA_EN & reg) {
printk(KERN_ERR "ata%u: Unable to stop eDMA\n", ap->id);
}
}
+static void mv_stop_dma(struct ata_port *ap)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&ap->host_set->lock, flags);
+ __mv_stop_dma(ap);
+ spin_unlock_irqrestore(&ap->host_set->lock, flags);
+}
+
static void mv_dump_mem(void __iomem *start, unsigned bytes)
{
#ifdef ATA_DEBUG
@@ -845,7 +848,7 @@ static int mv_qc_issue(struct ata_queued
* port. Turn off EDMA so there won't be problems accessing
* shadow block, etc registers.
*/
- mv_stop_dma(qc->ap);
+ __mv_stop_dma(qc->ap);
return ata_qc_issue_prot(qc);
}
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
