Module Name: src
Committed By: jdolecek
Date: Tue Oct 17 16:24:14 UTC 2017
Modified Files:
src/sys/dev/ic: mvsata.c
Log Message:
no need to clear DMA WAIT flag in mvsata_edma_handle(), it's not needed
by atabus layer
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/ic/mvsata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/mvsata.c
diff -u src/sys/dev/ic/mvsata.c:1.38 src/sys/dev/ic/mvsata.c:1.39
--- src/sys/dev/ic/mvsata.c:1.38 Tue Oct 10 16:30:23 2017
+++ src/sys/dev/ic/mvsata.c Tue Oct 17 16:24:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsata.c,v 1.38 2017/10/10 16:30:23 jdolecek Exp $ */
+/* $NetBSD: mvsata.c,v 1.39 2017/10/17 16:24:14 jdolecek Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.38 2017/10/10 16:30:23 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.39 2017/10/17 16:24:14 jdolecek Exp $");
#include "opt_mvsata.h"
@@ -2829,7 +2829,7 @@ mvsata_edma_handle(struct mvsata_port *m
struct ata_bio *ata_bio;
struct ata_xfer *xfer;
uint32_t reg;
- int erqqip, erqqop, erpqip, erpqop, prev_erpqop, quetag, handled = 0, n;
+ int erqqop, erpqip, erpqop, prev_erpqop, quetag, handled = 0, n;
int st, dmaerr;
/* First, Sync for Request Queue buffer */
@@ -2920,12 +2920,6 @@ mvsata_edma_handle(struct mvsata_port *m
mvsata_dma_bufunload(mvport, quetag, ata_bio->flags);
-#if 1 /* XXXX: flags clears here, because necessary the atabus layer. */
- erqqip = (MVSATA_EDMA_READ_4(mvport, EDMA_REQQIP) &
- EDMA_REQQP_ERQQP_MASK) >> EDMA_REQQP_ERQQP_SHIFT;
- if (erpqop == erqqip)
- chp->ch_flags &= ~(ATACH_DMA_WAIT);
-#endif
mvsata_bio_intr(chp, xfer, 1);
if (xfer1 == NULL)
handled++;
@@ -2952,13 +2946,6 @@ mvsata_edma_handle(struct mvsata_port *m
reg |= (erpqop << EDMA_RESQP_ERPQP_SHIFT);
MVSATA_EDMA_WRITE_4(mvport, EDMA_RESQOP, reg);
-#if 0 /* already cleared ago? */
- erqqip = (MVSATA_EDMA_READ_4(mvport, EDMA_REQQIP) &
- EDMA_REQQP_ERQQP_MASK) >> EDMA_REQQP_ERQQP_SHIFT;
- if (erpqop == erqqip)
- chp->ch_flags &= ~(ATACH_DMA_WAIT);
-#endif
-
return handled;
}
