[src/netbsd-1-6]: src/sys/dev/pci Pull up revision 1.191 (requested by nakaya...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6477232e3920
branches:  netbsd-1-6
changeset: 530206:6477232e3920
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Apr 28 06:25:40 2003 +0000

description:
Pull up revision 1.191 (requested by nakayama in ticket #1275):
Make DMA mode works on Promise Ultra66/100 with 48-bit LBA drives.
Ok'ed by bouyer in tech-kern%netbsd.org@localhost.

diffstat:

 sys/dev/pci/pciide.c |  68 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 66 insertions(+), 2 deletions(-)

diffs (103 lines):

diff -r aa5744e99f4b -r 6477232e3920 sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Mon Apr 28 06:25:24 2003 +0000
+++ b/sys/dev/pci/pciide.c      Mon Apr 28 06:25:40 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.153.2.10 2002/11/28 13:31:31 tron Exp $   */
+/*     $NetBSD: pciide.c,v 1.153.2.11 2003/04/28 06:25:40 tron Exp $   */
 
 
 /*
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.153.2.10 2002/11/28 13:31:31 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.153.2.11 2003/04/28 06:25:40 tron Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -194,6 +194,8 @@
 void pdc20268_setup_channel __P((struct channel_softc*));
 int  pdc202xx_pci_intr __P((void *));
 int  pdc20265_pci_intr __P((void *));
+static void pdc20262_dma_start __P((void*, int, int));
+static int  pdc20262_dma_finish __P((void*, int, int, int));
 
 void opti_chip_map __P((struct pciide_softc*, struct pci_attach_args*));
 void opti_setup_channel __P((struct channel_softc*));
@@ -3657,6 +3659,13 @@
        sc->sc_wdcdev.channels = sc->wdc_chanarray;
        sc->sc_wdcdev.nchannels = PCIIDE_NUM_CHANNELS;
 
+       if (sc->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA66 ||
+           sc->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA100 ||
+           sc->sc_pp->ide_product == PCI_PRODUCT_PROMISE_ULTRA100X) {
+               sc->sc_wdcdev.dma_start = pdc20262_dma_start;
+               sc->sc_wdcdev.dma_finish = pdc20262_dma_finish;
+       }
+
        if (!PDC_IS_268(sc)) {
                /* setup failsafe defaults */
                mode = 0;
@@ -3981,6 +3990,61 @@
        return rv;
 }
 
+static void
+pdc20262_dma_start(v, channel, drive)
+       void *v;
+       int channel, drive;
+{
+       struct pciide_softc *sc = v;
+       struct pciide_dma_maps *dma_maps =
+           &sc->pciide_channels[channel].dma_maps[drive];
+       int atapi;
+
+       if (dma_maps->dma_flags & WDC_DMA_LBA48) {
+               atapi = (dma_maps->dma_flags & WDC_DMA_READ) ?
+                   PDC262_ATAPI_LBA48_READ : PDC262_ATAPI_LBA48_WRITE;
+               atapi |= dma_maps->dmamap_xfer->dm_mapsize >> 1;
+               bus_space_write_4(sc->sc_dma_iot, sc->sc_dma_ioh,
+                   PDC262_ATAPI(channel), atapi);
+       }
+
+       pciide_dma_start(v, channel, drive);
+}
+
+int
+pdc20262_dma_finish(v, channel, drive, force)
+       void *v;
+       int channel, drive;
+       int force;
+{
+       struct pciide_softc *sc = v;
+       struct pciide_dma_maps *dma_maps =
+           &sc->pciide_channels[channel].dma_maps[drive];
+       struct channel_softc *chp;
+       int atapi, error;
+
+       error = pciide_dma_finish(v, channel, drive, force);
+
+       if (dma_maps->dma_flags & WDC_DMA_LBA48) {
+               chp = sc->wdc_chanarray[channel];
+               atapi = 0;
+               if (chp->ch_drive[0].drive_flags & DRIVE_ATAPI ||
+                   chp->ch_drive[1].drive_flags & DRIVE_ATAPI) {
+                       if ((!(chp->ch_drive[0].drive_flags & DRIVE_UDMA) ||
+                           (chp->ch_drive[1].drive_flags & DRIVE_UDMA) ||
+                           !(chp->ch_drive[1].drive_flags & DRIVE_DMA)) &&
+                           (!(chp->ch_drive[1].drive_flags & DRIVE_UDMA) ||
+                           (chp->ch_drive[0].drive_flags & DRIVE_UDMA) ||
+                           !(chp->ch_drive[0].drive_flags & DRIVE_DMA)))
+                               atapi = PDC262_ATAPI_UDMA;
+               }
+               bus_space_write_4(sc->sc_dma_iot, sc->sc_dma_ioh,
+                   PDC262_ATAPI(channel), atapi);
+       }
+
+       return error;
+}
+
 void
 opti_chip_map(sc, pa)
        struct pciide_softc *sc;