Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Run at Ultra/66 on VIA controllers that can do it. PCI vendor/device/revision 

is the same for the Ultra/33 and Ultra/66 version, so test writability of
the U66 enable bit (idea from Chris Cappuccio).
Thanks to David Carrel for testings.
This commit is contained in:
bouyer 2001-01-05 18:04:42 +00:00
parent 52f9536913
commit 69153b6b36
2 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
sys/dev/pci/pciide.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pciide.c,v 1.103 2001/01/05 15:34:05 bouyer Exp $ */
/* $NetBSD: pciide.c,v 1.104 2001/01/05 18:04:42 bouyer Exp $ */
/*
@ -1921,7 +1921,7 @@ apollo_chip_map(sc, pa)
pcireg_t interface = PCI_INTERFACE(pa->pa_class);
int rev = PCI_REVISION(pa->pa_class);
int channel;
u_int32_t ideconf;
u_int32_t ideconf, udma_conf, old_udma_conf;
bus_size_t cmdsize, ctlsize;
if (pciide_chipen(sc, pa) == 0)
@ -1946,13 +1946,39 @@ apollo_chip_map(sc, pa)
sc->sc_wdcdev.channels = sc->wdc_chanarray;
sc->sc_wdcdev.nchannels = PCIIDE_NUM_CHANNELS;
old_udma_conf = pci_conf_read(sc->sc_pc, sc->sc_tag, APO_UDMA);
WDCDEBUG_PRINT(("apollo_chip_map: old APO_IDECONF=0x%x, "
"APO_CTLMISC=0x%x, APO_DATATIM=0x%x, APO_UDMA=0x%x\n",
pci_conf_read(sc->sc_pc, sc->sc_tag, APO_IDECONF),
pci_conf_read(sc->sc_pc, sc->sc_tag, APO_CTLMISC),
pci_conf_read(sc->sc_pc, sc->sc_tag, APO_DATATIM),
pci_conf_read(sc->sc_pc, sc->sc_tag, APO_UDMA)),
old_udma_conf),
DEBUG_PROBE);
pci_conf_write(sc->sc_pc, sc->sc_tag,
old_udma_conf | (APO_UDMA_PIO_MODE(0, 0) | APO_UDMA_EN(0, 0) |
APO_UDMA_EN_MTH(0, 0) | APO_UDMA_CLK66(0)),
APO_UDMA);
udma_conf = pci_conf_read(sc->sc_pc, sc->sc_tag, APO_UDMA);
WDCDEBUG_PRINT(("apollo_chip_map: APO_UDMA now 0x%x\n", udma_conf),
DEBUG_PROBE);
if ((udma_conf & (APO_UDMA_PIO_MODE(0, 0) | APO_UDMA_EN(0, 0) |
APO_UDMA_EN_MTH(0, 0))) ==
(APO_UDMA_PIO_MODE(0, 0) | APO_UDMA_EN(0, 0) |
APO_UDMA_EN_MTH(0, 0))) {
if ((udma_conf & APO_UDMA_CLK66(0)) ==
APO_UDMA_CLK66(0)) {
printf("%s: Ultra/66 capable\n",
sc->sc_wdcdev.sc_dev.dv_xname);
sc->sc_wdcdev.UDMA_cap = 4;
} else {
printf("%s: Ultra/33 capable\n",
sc->sc_wdcdev.sc_dev.dv_xname);
sc->sc_wdcdev.UDMA_cap = 2;
}
} else {
sc->sc_wdcdev.cap &= ~WDC_CAPABILITY_UDMA;
}
pci_conf_write(sc->sc_pc, sc->sc_tag, old_udma_conf, APO_UDMA);
for (channel = 0; channel < sc->sc_wdcdev.nchannels; channel++) {
cp = &sc->pciide_channels[channel];
@ -2005,6 +2031,24 @@ apollo_setup_channel(chp)
/* setup DMA if needed */
pciide_channel_dma_setup(cp);
/*
* We can't mix Ultra/33 and Ultra/66 on the same channel, so
* downgrade to Ultra/33 if needed
*/
if ((chp->ch_drive[0].drive_flags & DRIVE_UDMA) &&
(chp->ch_drive[1].drive_flags & DRIVE_UDMA)) {
/* both drives UDMA */
if (chp->ch_drive[0].UDMA_mode > 2 &&
chp->ch_drive[1].UDMA_mode <= 2) {
/* drive 0 Ultra/66, drive 1 Ultra/33 */
chp->ch_drive[0].UDMA_mode = 2;
} else if (chp->ch_drive[1].UDMA_mode > 2 &&
chp->ch_drive[0].UDMA_mode <= 2) {
/* drive 1 Ultra/66, drive 0 Ultra/33 */
chp->ch_drive[1].UDMA_mode = 2;
}
}
for (drive = 0; drive < 2; drive++) {
drvp = &chp->ch_drive[drive];
/* If no drive, skip */
@ -2024,6 +2068,9 @@ apollo_setup_channel(chp)
APO_UDMA_EN_MTH(chp->channel, drive) |
APO_UDMA_TIME(chp->channel, drive,
apollo_udma_tim[drvp->UDMA_mode]);
if (drvp->UDMA_mode > 2)
udmatim_reg |=
APO_UDMA_CLK66(chp->channel);
/* can use PIO timings, MW DMA unused */
mode = drvp->PIO_mode;
} else {

5
sys/dev/pci/pciide_apollo_reg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pciide_apollo_reg.h,v 1.7 2000/12/29 18:59:01 tsutsui Exp $ */
/* $NetBSD: pciide_apollo_reg.h,v 1.8 2001/01/05 18:04:43 bouyer Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
@ -88,7 +88,8 @@
(((1 - (channel)) << 4) + ((1 - (drive)) << 3)))
#define APO_UDMA_EN_MTH(channel, drive) (0x80 << \
(((1 - (channel)) << 4) + ((1 - (drive)) << 3)))
#define APO_UDMA_CLK66(channel) (0x08 << ((1 - (channel)) << 4))
static int8_t apollo_udma_tim[] = {0x03, 0x02, 0x00};
static int8_t apollo_udma_tim[] = {0x03, 0x02, 0x00, 0x02, 0x00};
static int8_t apollo_pio_set[] = {0x0a, 0x0a, 0x0a, 0x02, 0x02};
static int8_t apollo_pio_rec[] = {0x08, 0x08, 0x08, 0x02, 0x00};