Hello, Mikael.
Thanks for doing this.
Mikael Pettersson wrote:
[--snip--]
> +static void pdc_freeze(struct ata_port *ap)
> +{
> + void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr;
> + u32 tmp;
> +
> + tmp = readl(mmio + PDC_CTLSTAT);
> + tmp |= PDC_IRQ_DISABLE;
> + tmp &= ~PDC_DMA_ENABLE;
> + writel(tmp, mmio + PDC_CTLSTAT);
> + readl(mmio + PDC_CTLSTAT); /* flush *//* XXX: needed? sata_sil does this */
Just drop the above line.
> +}
> +
> +static void pdc_thaw(struct ata_port *ap)
> +{
> + void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr;
> + u32 tmp;
> +
> + /* clear IRQ */
> + readl(mmio + PDC_INT_SEQMASK);
> +
> + /* turn IRQ back on */
> + tmp = readl(mmio + PDC_CTLSTAT);
> + tmp &= ~PDC_IRQ_DISABLE;
> + writel(tmp, mmio + PDC_CTLSTAT);
> + readl(mmio + PDC_CTLSTAT); /* flush *//* XXX: needed? */
Ditto.
> +}
> +
> +static void pdc_error_handler(struct ata_port *ap)
> +{
> + struct ata_eh_context *ehc = &ap->eh_context;
> + ata_reset_fn_t hardreset;
> +
> + /* stop DMA, mask IRQ, don't clobber anything else */
> + ata_eh_freeze_port(ap);
Don't freeze port unconditionally. You'll end up hardresetting on every
error. Just make sure DMA engine is stopped and the controller is in a
sane state. If that fails, then, the port should be frozen.
> + hardreset = NULL;
> + if (sata_scr_valid(ap)) {
> + ehc->i.action |= ATA_EH_HARDRESET;
Why always force HARDRESET?
> + hardreset = sata_std_hardreset;
> + }
--
tejun
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
