Attachment 259141 Details for Bug 351451 – Additional patch

[patch] Additional patch

sata_nv-dont-use-legacy-dma-in-adma-mode.patch (text/plain), 2.45 KB, created by Robert Hancock on 2007-11-15 00:12:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Hancock

Created: 2007-11-15 00:12:27 UTC

Size: 2.45 KB

patch

obsolete

>We need to run any DMA command with result taskfile requested in ADMA mode
>when the port is in ADMA mode, otherwise it may try to use the legacy DMA engine
>in ADMA mode which is not allowed. Enforce this with BUG_ON() since data
>corruption could potentially result if this happened.
>
>Signed-off-by: Robert Hancock <hancockr@shaw.ca>
>
>--- linux-2.6.24-rc1-git10/drivers/ata/sata_nv.c	2007-11-01 20:01:32.000000000 -0600
>+++ linux-2.6.24-rc1-git10edit/drivers/ata/sata_nv.c	2007-11-13 19:01:09.000000000 -0600
>@@ -791,11 +797,13 @@
> 
> static void nv_adma_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
> {
>-	/* Since commands where a result TF is requested are not
>-	   executed in ADMA mode, the only time this function will be called
>-	   in ADMA mode will be if a command fails. In this case we
>-	   don't care about going into register mode with ADMA commands
>-	   pending, as the commands will all shortly be aborted anyway. */
>+	/* Other than when internal or pass-through commands are executed,
>+	   the only time this function will be called in ADMA mode will be
>+	   if a command fails. In the failure case we don't care about going
>+	   into register mode with ADMA commands pending, as the commands will
>+	   all shortly be aborted anyway. We assume that NCQ commands are not
>+	   issued via passthrough and so this will not abort any commands in
>+	   that case. */
> 	nv_adma_register_mode(ap);
> 
> 	ata_tf_read(ap, tf);
>@@ -1359,11 +1376,9 @@
> 	struct nv_adma_port_priv *pp = qc->ap->private_data;
> 
> 	/* ADMA engine can only be used for non-ATAPI DMA commands,
>-	   or interrupt-driven no-data commands, where a result taskfile
>-	   is not required. */
>+	   or interrupt-driven no-data commands. */
> 	if ((pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) ||
>-	   (qc->tf.flags & ATA_TFLAG_POLLING) ||
>-	   (qc->flags & ATA_QCFLAG_RESULT_TF))
>+	   (qc->tf.flags & ATA_TFLAG_POLLING))
> 		return 1;
> 
> 	if ((qc->flags & ATA_QCFLAG_DMAMAP) ||
>@@ -1381,6 +1396,8 @@
> 		       NV_CPB_CTL_IEN;
> 
> 	if (nv_adma_use_reg_mode(qc)) {
>+		BUG_ON(!(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) &&
>+			(qc->flags & ATA_QCFLAG_DMAMAP));
> 		nv_adma_register_mode(qc->ap);
> 		ata_qc_prep(qc);
> 		return;
>@@ -1428,6 +1445,8 @@
> 	if (nv_adma_use_reg_mode(qc)) {
> 		/* use ATA register mode */
> 		VPRINTK("using ATA register mode: 0x%lx\n", qc->flags);
>+		BUG_ON(!(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) &&
>+			(qc->flags & ATA_QCFLAG_DMAMAP));
> 		nv_adma_register_mode(qc->ap);
> 		return ata_qc_issue_prot(qc);
> 	} else
>

Actions: View | Diff

Attachments on bug 351451: 237981 | 242451 | 242611 | 246361 | 247451 | 254191 | 255811 | 257561 | 259141 | 263811 | 264021 | 265241 | 265521 | 265601 | 293360 | 293601